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
..
cgroup-internal.h
cgroup-v1.c	cgroup: Restructure release_agent_path handling	2020-03-12 16:44:35 -04:00
cgroup.c	bpf: Refactor bpf_link update handling	2020-04-28 17:27:07 -07:00
cpuset.c	docs: cgroup-v1: Document the cpuset_v2_mode mount option	2020-04-03 11:42:56 -04:00
debug.c
freezer.c
legacy_freezer.c
Makefile
namespace.c
pids.c	clone3: allow spawning processes into cgroups	2020-02-12 17:57:51 -05:00
rdma.c
rstat.c	Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window"	2020-04-09 14:55:46 -04:00