summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-09ktest.pl: fix englishPavel Machek
Ajdust spelling to more common "mandatory". Variant "mandidory" is certainly wrong. Link: http://lkml.kernel.org/r/20161011073003.GA19476@amd Signed-off-by: Pavel Machek <pavel@ucw.cz> Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2016-12-09drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expressionAndrew Morton
This cast is no longer needed. Cc: Johannes Berg <johannes.berg@intel.com> Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Cc: Intel Linux Wireless <linuxwifi@intel.com> Cc: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2016-12-09posix-timers: give lazy compilers some help optimizing code awayNicolas Pitre
The OpenRISC compiler (so far) fails to optimize away a large portion of code containing a reference to posix_timer_event in alarmtimer.c when CONFIG_POSIX_TIMERS is unset. Let's give it a direct clue to let the build succeed. This fixes [linux-next:master 6682/7183] alarmtimer.c:undefined reference to `posix_timer_event' reported by kbuild test robot. Signed-off-by: Nicolas Pitre <nico@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2016-12-09Merge branch 'akpm-current/current'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'rtc/rtc-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'coresight/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'y2038/y2038'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'kselftest/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'userns/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'dma-buf/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'pwm/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'gpio/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'rpmsg/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'libata/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'scsi-mkp/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'scsi/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'cgroup/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'slave-dma/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'extcon/extcon-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'char-misc/char-misc-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
2016-12-09inotify: Convert to using per-namespace limitsNikolay Borisov
This patchset converts inotify to using the newly introduced per-userns sysctl infrastructure. Currently the inotify instances/watches are being accounted in the user_struct structure. This means that in setups where multiple users in unprivileged containers map to the same underlying real user (i.e. pointing to the same user_struct) the inotify limits are going to be shared as well, allowing one user(or application) to exhaust all others limits. Fix this by switching the inotify sysctls to using the per-namespace/per-user limits. This will allow the server admin to set sensible global limits, which can further be tuned inside every individual user namespace. Additionally, in order to preserve the sysctl ABI make the existing inotify instances/watches sysctls modify the values of the initial user namespace. Acked-by: Jan Kara <jack@suse.cz> Acked-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
2016-12-09Merge remote-tracking branch 'ipmi/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'chrome-platform/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'drivers-x86/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'xen-tip/linux-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'kvm-arm/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'rcu/rcu/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'ftrace/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'irqchip/irqchip/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'edac/linux_next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2016-12-09next-20161208/spiStephen Rothwell
2016-12-09Merge remote-tracking branch 'devicetree/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'audit/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'vfio/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'iommu/next'Stephen Rothwell
2016-12-09Merge remote-tracking branch 'selinux/next'Stephen Rothwell