David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
accounting	SPDX patches for 5.7-rc1.	2020-04-03 13:12:26 -07:00
arch	x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long"	2020-05-26 16:42:43 +02:00
bootconfig	tools/bootconfig: Fix apply_xbc() to return zero on success	2020-05-11 17:00:26 -04:00
bpf	bpf, bpftool: Enable get{peer, sock}name attach types	2020-05-19 11:32:04 -07:00
build	tools/build: tweak unused value workaround	2020-04-21 11:11:55 -07:00
cgroup	iocost: protect iocg->abs_vdebt with iocg->waitq.lock	2020-05-05 09:23:18 -06:00
debugging	…
edid	tools/edid: Move EDID data sets from Documentation/	2020-02-19 04:10:32 -07:00
firewire	…
firmware	Driver Core and debugfs changes for 5.3-rc1	2019-07-12 12:24:03 -07:00
gpio	This is the bulk of GPIO development for the v5.7 kernel cycle.	2020-04-04 10:27:00 -07:00
hv	Tools: hv: Reopen the devices if read() or write() returns errors	2020-01-26 22:10:10 -05:00
iio	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
include	tools/bpf: sync bpf.h	2020-05-19 11:39:53 -07:00
io_uring	…
kvm/kvm_stat	tools/kvm_stat: add command line switch '-c' to log in csv format	2020-03-23 15:44:21 -04:00
laptop	change email address for Pali Rohár	2020-04-10 15:36:22 -07:00
leds	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
lib	bpf, libbpf: Enable get{peer, sock}name attach types	2020-05-19 11:32:04 -07:00
memory-model	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
nfsd	…
objtool	A set of fixes for x86:	2020-05-10 11:59:53 -07:00
pci	tools: PCI: Add 'e' to clear IRQ	2020-04-02 17:57:10 +01:00
pcmcia	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
perf	perf annotate: Add basic support for bpf_image	2020-04-16 12:19:06 -03:00
power	pm-graph v5.6	2020-04-20 10:37:02 +02:00
scripts	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-25 18:58:11 -07:00
spi	SPDX patches for 5.7-rc1.	2020-04-03 13:12:26 -07:00
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
thermal/tmon	- Convert tsens configuration DT binding to yaml (Rajeshwari)	2020-04-07 20:00:16 -07:00
time	…
usb	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
virtio	tools/virtio: make asm/barrier.h self contained	2020-04-17 06:05:29 -04:00
vm	tools/vm: fix cross-compile build	2020-04-21 11:11:56 -07:00
wmi	…
Makefile	tools: bootconfig: Add bootconfig command	2020-01-13 13:19:39 -05:00