]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:20:30 +0000 (16:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:20:30 +0000 (16:20 +1000)
commit676b0f7b56e66a192bfb49aa1c690c5a9b213dc7
tree4b8e4410c8285b361210ddb5293d66b07a5ce167
parent296b1448e1cf8f5c16e6c8c27b4b059b0cbe77fc
parent5e6b8a50a7cec5686ee2c4bda1d49899c79a7eae
Merge remote-tracking branch 'userns/for-next'

# Conflicts:
# include/linux/sched/user.h
# include/linux/user_namespace.h
# kernel/signal.c
# kernel/ucount.c
19 files changed:
fs/hugetlbfs/inode.c
fs/proc/array.c
include/linux/cred.h
include/linux/hugetlb.h
include/linux/mm.h
include/linux/sched/user.h
include/linux/user_namespace.h
ipc/mqueue.c
kernel/cred.c
kernel/exit.c
kernel/fork.c
kernel/signal.c
kernel/sys.c
kernel/ucount.c
kernel/user_namespace.c
mm/mlock.c
mm/mmap.c
mm/shmem.c
tools/testing/selftests/Makefile