Linus Torvalds
dd198ce714
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull namespace updates from Eric Biederman:
"Life has been busy and I have not gotten half as much done this round
as I would have liked. I delayed it so that a minor conflict
resolution with the mips tree could spend a little time in linux-next
before I sent this pull request.
This includes two long delayed user namespace changes from Kirill
Tkhai. It also includes a very useful change from Serge Hallyn that
allows the security capability attribute to be used inside of user
namespaces. The practical effect of this is people can now untar
tarballs and install rpms in user namespaces. It had been suggested to
generalize this and encode some of the namespace information
information in the xattr name. Upon close inspection that makes the
things that should be hard easy and the things that should be easy
more expensive.
Then there is my bugfix/cleanup for signal injection that removes the
magic encoding of the siginfo union member from the kernel internal
si_code. The mips folks reported the case where I had used FPE_FIXME
me is impossible so I have remove FPE_FIXME from mips, while at the
same time including a return statement in that case to keep gcc from
complaining about unitialized variables.
I almost finished the work to get make copy_siginfo_to_user a trivial
copy to user. The code is available at:
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git neuter-copy_siginfo_to_user-v3
But I did not have time/energy to get the code posted and reviewed
before the merge window opened.
I was able to see that the security excuse for just copying fields
that we know are initialized doesn't work in practice there are buggy
initializations that don't initialize the proper fields in siginfo. So
we still sometimes copy unitialized data to userspace"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
Introduce v3 namespaced file capabilities
mips/signal: In force_fcr31_sig return in the impossible case
signal: Remove kernel interal si_code magic
fcntl: Don't use ambiguous SIG_POLL si_codes
prctl: Allow local CAP_SYS_ADMIN changing exe_file
security: Use user_namespace::level to avoid redundant iterations in cap_capable()
userns,pidns: Verify the userns for new pid namespaces
signal/testing: Don't look for __SI_FAULT in userspace
signal/mips: Document a conflict with SI_USER with SIGFPE
signal/sparc: Document a conflict with SI_USER with SIGFPE
signal/ia64: Document a conflict with SI_USER with SIGFPE
signal/alpha: Document a conflict with SI_USER for SIGTRAP
2017-09-11 18:34:47 -07:00
include: warn for inconsistent endian config definition
2017-09-08 18:26:48 -07:00
firmware /meson
Merge branch 'i2c/for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2017-09-09 14:18:40 -07:00
- New Drivers
2017-09-07 13:51:13 -07:00
MTD changes for 4.14:
2017-09-09 14:48:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-09-06 14:45:08 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-09-06 14:45:08 -07:00
MMC core:
2017-09-07 12:24:50 -07:00
ARM/arm64: SoC platform updates for v4.14
2017-09-10 20:35:46 -07:00
Merge branch 'akpm' (patches from Andrew)
2017-09-06 20:49:49 -07:00
ARM: SoC driver updates for v4.14
2017-09-10 20:40:00 -07:00
Device properties framework updates for v4.14-rc1
2017-09-05 12:50:00 -07:00
Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block
2017-09-07 11:59:42 -07:00
bitmap: introduce BITMAP_FROM_U64()
2017-09-08 18:26:49 -07:00
bitops: avoid integer overflow in GENMASK(_ULL)
2017-09-08 18:26:48 -07:00
Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block
2017-09-07 11:59:42 -07:00
bpf: add support for sockmap detach programs
2017-09-08 21:11:00 -07:00
SCSI misc on 20170907
2017-09-07 21:11:05 -07:00
Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block
2017-09-07 11:59:42 -07:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-09-04 12:21:28 -07:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-09-04 12:21:28 -07:00
powerpc updates for 4.14
2017-09-07 10:15:40 -07:00
cpumask: make cpumask_next() out-of-line
2017-09-08 18:26:51 -07:00
libnvdimm for 4.14
2017-09-11 13:10:57 -07:00
Merge branch 'topic/dmatest' into for-linus
2017-09-06 21:55:10 +05:30
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-09-07 09:42:35 -07:00
autofs: fix AT_NO_AUTOMOUNT not being honored
2017-09-08 18:26:50 -07:00
fscache: remove unused ->now_uncached callback
2017-09-06 17:27:26 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2017-09-05 11:54:41 -07:00
mm/hmm: fix build when HMM is disabled
2017-09-08 18:26:46 -07:00
mm: thp: check pmd migration entry in common path
2017-09-08 18:26:45 -07:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-09-07 09:25:15 -07:00
locking/rtmutex: replace top-waiter and pi_waiters leftmost caching
2017-09-08 18:26:49 -07:00
lib/interval_tree: fast overlap detection
2017-09-08 18:26:49 -07:00
lib/interval-tree: correct comment wrt generic flavor
2017-09-08 18:26:49 -07:00
mm/device-public-memory: device memory cache coherent with CPU
2017-09-08 18:26:46 -07:00
ipc: optimize semget/shmget/msgget for lots of keys
2017-09-08 18:26:51 -07:00
ipc: optimize semget/shmget/msgget for lots of keys
2017-09-08 18:26:51 -07:00
Device properties framework updates for v4.14-rc1
2017-09-05 12:50:00 -07:00
linux/kernel.h: move DIV_ROUND_DOWN_ULL() macro
2017-09-08 18:26:47 -07:00
kmod: split off umh headers into its own file
2017-09-08 18:26:51 -07:00
net: mdio-mux: add mdio_mux parameter to mdio_mux_init()
2017-09-05 14:42:52 -07:00
mm: memcontrol: use int for event/state parameter in several functions
2017-09-06 17:27:27 -07:00
mm/memory_hotplug: introduce add_pages
2017-09-08 18:26:46 -07:00
mm/hmm: avoid bloating arch that do not make use of HMM
2017-09-08 18:26:46 -07:00
mm/hmm: avoid bloating arch that do not make use of HMM
2017-09-08 18:26:46 -07:00
mm/migrate: new migrate mode MIGRATE_SYNC_NO_COPY
2017-09-08 18:26:46 -07:00
lib/interval_tree: fast overlap detection
2017-09-08 18:26:49 -07:00
mm/hmm: heterogeneous memory management (HMM for short)
2017-09-08 18:26:45 -07:00
mm: update NUMA counter threshold size
2017-09-08 18:26:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-09-06 14:45:08 -07:00
Merge branch 'for-4.14/block-postmerge' of git://git.kernel.dk/linux-block
2017-09-09 12:49:01 -07:00
mm: test code to write THP to swap device as a whole
2017-09-06 17:27:28 -07:00
mm: implement find_get_pages_range()
2017-09-06 17:27:26 -07:00
mm: remove nr_pages argument from pagevec_lookup{,_range}()
2017-09-06 17:27:27 -07:00
Merge branch 'pci/endpoint' into next
2017-09-07 13:24:11 -05:00
pci-v4.14-changes
2017-09-08 15:47:43 -07:00
Merge branch 'pci/trivial' into next
2017-09-07 13:24:20 -05:00
Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-09-04 13:56:37 -07:00
drivers/pps: aesthetic tweaks to PPS-related content
2017-09-08 18:26:51 -07:00
drivers/pps: aesthetic tweaks to PPS-related content
2017-09-08 18:26:51 -07:00
proc: uninline proc_create()
2017-09-08 18:26:47 -07:00
rbtree: cache leftmost node internally
2017-09-08 18:26:48 -07:00
rbtree: cache leftmost node internally
2017-09-08 18:26:48 -07:00
SCSI misc on 20170907
2017-09-07 21:11:05 -07:00
lib/rhashtable: fix comment on locks_mul default value
2017-09-08 18:26:49 -07:00
lib/interval_tree: fast overlap detection
2017-09-08 18:26:49 -07:00
locking/rtmutex: replace top-waiter and pi_waiters leftmost caching
2017-09-08 18:26:49 -07:00
locking/rtmutex: replace top-waiter and pi_waiters leftmost caching
2017-09-08 18:26:49 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2017-09-11 18:34:47 -07:00
mm: shm: use new hugetlb size encoding definitions
2017-09-06 17:27:28 -07:00
userfaultfd: shmem: add shmem_mfill_zeropage_pte for userfaultfd support
2017-09-06 17:27:28 -07:00
mm: track actual nr_scanned during shrink_slab()
2017-09-06 17:27:24 -07:00
udp: drop head states only when all skb references are gone
2017-09-07 20:02:39 -07:00
mm: add SLUB free list pointer obfuscation
2017-09-06 17:27:24 -07:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-09-04 11:52:29 -07:00
Merge branch 'for-4.14/block-postmerge' of git://git.kernel.dk/linux-block
2017-09-09 12:49:01 -07:00
mm/ZONE_DEVICE: new type of ZONE_DEVICE for unaddressable memory
2017-09-08 18:26:46 -07:00
mm/ZONE_DEVICE: new type of ZONE_DEVICE for unaddressable memory
2017-09-08 18:26:46 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-09-06 14:45:08 -07:00
Nothing new in development for this release. These are mostly
2017-09-08 15:08:14 -07:00
kmod: split off umh headers into its own file
2017-09-08 18:26:51 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2017-09-11 18:34:47 -07:00
mm, swap: add swap readahead hit statistics
2017-09-06 17:27:29 -07:00
mm: consider the number in local CPUs when reading NUMA stats
2017-09-08 18:26:47 -07:00
vga: optimise console scrolling
2017-09-08 18:26:48 -07:00
workqueue: Fix flag collision
2017-09-05 06:34:17 -07:00
