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
..
arraymap.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-15 13:48:59 -07:00
bpf_iter.c	bpf: Enable bpf_iter targets registering ctx argument types	2020-05-13 12:30:50 -07:00
bpf_lru_list.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
bpf_lru_list.h	bpf: Fix a typo "inacitve" -> "inactive"	2020-04-06 21:54:10 +02:00
bpf_lsm.c	bpf: lsm: Implement attach, detach and execution	2020-03-30 01:34:00 +02:00
bpf_struct_ops.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
bpf_struct_ops_types.h	bpf: tcp: Support tcp_congestion_ops in bpf	2020-01-09 08:46:18 -08:00
btf.c	bpf: Enable bpf_iter targets registering ctx argument types	2020-05-13 12:30:50 -07:00
cgroup.c	bpf: Add support for BPF_OBJ_GET_INFO_BY_FD for bpf_link	2020-04-28 17:27:08 -07:00
core.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
cpumap.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
devmap.c	xdp: export the DEV_MAP_BULK_SIZE macro	2020-04-22 20:11:29 -07:00
disasm.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
disasm.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
dispatcher.c	bpf: Remove bpf_image tree	2020-03-13 12:49:52 -07:00
hashtab.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
helpers.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
inode.c	bpf: Create file bpf iterator	2020-05-09 17:05:26 -07:00
local_storage.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-22 09:54:33 -08:00
lpm_trie.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
Makefile	xsk: Move xskmap.c to net/xdp/	2020-05-21 17:31:26 -07:00
map_in_map.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
map_in_map.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
map_iter.c	bpf: Enable bpf_iter targets registering ctx argument types	2020-05-13 12:30:50 -07:00
offload.c	bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill	2020-02-17 16:53:49 +01:00
percpu_freelist.c	bpf: Dont iterate over possible CPUs with interrupts disabled	2020-02-24 16:18:20 -08:00
percpu_freelist.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
queue_stack_maps.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
reuseport_array.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
stackmap.c	bpf: Implement CAP_BPF	2020-05-15 17:29:41 +02:00
syscall.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-24 13:47:27 -07:00
sysfs_btf.c	bpf: Support llvm-objcopy for vmlinux BTF	2020-03-19 12:32:38 +01:00
task_iter.c	bpf: Fix bpf_iter's task iterator logic	2020-05-14 18:37:32 -07:00
tnum.c	bpf: Verifier, do explicit ALU32 bounds tracking	2020-03-30 14:59:53 -07:00
trampoline.c	bpf: lsm: Implement attach, detach and execution	2020-03-30 01:34:00 +02:00
verifier.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00