Commit a2e5790d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc updates from Andrew Morton:

 - kasan updates

 - procfs

 - lib/bitmap updates

 - other lib/ updates

 - checkpatch tweaks

 - rapidio

 - ubsan

 - pipe fixes and cleanups

 - lots of other misc bits

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
  Documentation/sysctl/user.txt: fix typo
  MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns
  MAINTAINERS: update various PALM patterns
  MAINTAINERS: update "ARM/OXNAS platform support" patterns
  MAINTAINERS: update Cortina/Gemini patterns
  MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern
  MAINTAINERS: remove ANDROID ION pattern
  mm: docs: add blank lines to silence sphinx "Unexpected indentation" errors
  mm: docs: fix parameter names mismatch
  mm: docs: fixup punctuation
  pipe: read buffer limits atomically
  pipe: simplify round_pipe_size()
  pipe: reject F_SETPIPE_SZ with size over UINT_MAX
  pipe: fix off-by-one error when checking buffer limits
  pipe: actually allow root to exceed the pipe buffer limits
  pipe, sysctl: remove pipe_proc_fn()
  pipe, sysctl: drop 'min' parameter from pipe-max-size converter
  kasan: rework Kconfig settings
  crash_dump: is_kdump_kernel can be boolean
  kernel/mutex: mutex_is_locked can be boolean
  ...
parents ab2d92ad 60c3e026

Documentation/sysctl/user.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Documentation for /proc/sys/user/* kernel version 4.9.0 


==============================================================



This file contains the documetation for the sysctl files in

This file contains the documentation for the sysctl files in

/proc/sys/user.



The files in this directory can be used to override the default

MAINTAINERS

+10 −19
Original line number Diff line number Diff line
@@ -903,7 +903,6 @@ L: devel@driverdev.osuosl.org 
S:	Supported

F:	drivers/staging/android/ion

F:	drivers/staging/android/uapi/ion.h

F:	drivers/staging/android/uapi/ion_test.h



AOA (Apple Onboard Audio) ALSA DRIVER

M:	Johannes Berg <johannes@sipsolutions.net>
@@ -1308,7 +1307,6 @@ M: Russell King <linux@armlinux.org.uk> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev

F:	arch/arm/include/asm/clkdev.h

F:	drivers/clk/clkdev.c



ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
@@ -1360,7 +1358,7 @@ F: Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt 
F:	Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt

F:	Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt

F:	arch/arm/mach-gemini/

F:	drivers/net/ethernet/cortina/gemini/*

F:	drivers/net/ethernet/cortina/

F:	drivers/pinctrl/pinctrl-gemini.c

F:	drivers/rtc/rtc-ftrtc010.c
@@ -1737,9 +1735,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
L:	linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-oxnas/

F:	arch/arm/boot/dts/ox8*.dtsi

F:	arch/arm/boot/dts/wd-mbwe.dts

F:	arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts

F:	arch/arm/boot/dts/ox8*.dts*

N:	oxnas



ARM/PALM TREO SUPPORT
@@ -1747,8 +1743,7 @@ M: Tomas Cech <sleep_walker@suse.com> 
L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained

F:	arch/arm/mach-pxa/include/mach/palmtreo.h

F:	arch/arm/mach-pxa/palmtreo.c

F:	arch/arm/mach-pxa/palmtreo.*



ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>
@@ -1757,12 +1752,10 @@ W: http://hackndev.com 
S:	Maintained

F:	arch/arm/mach-pxa/include/mach/palmtx.h

F:	arch/arm/mach-pxa/palmtx.c

F:	arch/arm/mach-pxa/include/mach/palmt5.h

F:	arch/arm/mach-pxa/palmt5.c

F:	arch/arm/mach-pxa/palmt5.*

F:	arch/arm/mach-pxa/include/mach/palmld.h

F:	arch/arm/mach-pxa/palmld.c

F:	arch/arm/mach-pxa/include/mach/palmte2.h

F:	arch/arm/mach-pxa/palmte2.c

F:	arch/arm/mach-pxa/palmte2.*

F:	arch/arm/mach-pxa/include/mach/palmtc.h

F:	arch/arm/mach-pxa/palmtc.c
@@ -1771,8 +1764,7 @@ M: Sergey Lapin <slapin@ossfans.org> 
L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained

F:	arch/arm/mach-pxa/include/mach/palmz72.h

F:	arch/arm/mach-pxa/palmz72.c

F:	arch/arm/mach-pxa/palmz72.*



ARM/PLEB SUPPORT

M:	Peter Chubb <pleb@gelato.unsw.edu.au>
@@ -1801,7 +1793,6 @@ F: drivers/clk/qcom/ 
F:	drivers/dma/qcom/

F:	drivers/soc/qcom/

F:	drivers/spi/spi-qup.c

F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.c

F:	drivers/*/pm8???-*

F:	drivers/mfd/ssbi.c
@@ -3567,7 +3558,7 @@ F: drivers/media/platform/coda/ 


COMMON CLK FRAMEWORK

M:	Michael Turquette <mturquette@baylibre.com>

M:	Stephen Boyd <sboyd@codeaurora.org>

M:	Stephen Boyd <sboyd@kernel.org>

L:	linux-clk@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-clk/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
@@ -10284,7 +10275,7 @@ F: include/uapi/linux/openvswitch.h 
OPERATING PERFORMANCE POINTS (OPP)

M:	Viresh Kumar <vireshk@kernel.org>

M:	Nishanth Menon <nm@ti.com>

M:	Stephen Boyd <sboyd@codeaurora.org>

M:	Stephen Boyd <sboyd@kernel.org>

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
@@ -13020,7 +13011,7 @@ F: Documentation/networking/spider_net.txt 
F:	drivers/net/ethernet/toshiba/spider_net*



SPMI SUBSYSTEM

R:	Stephen Boyd <sboyd@codeaurora.org>

R:	Stephen Boyd <sboyd@kernel.org>

L:	linux-arm-msm@vger.kernel.org

F:	Documentation/devicetree/bindings/spmi/

F:	drivers/spmi/
@@ -13905,7 +13896,7 @@ F: include/linux/usb/tilegx.h 
TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER

M:	John Stultz <john.stultz@linaro.org>

M:	Thomas Gleixner <tglx@linutronix.de>

R:	Stephen Boyd <sboyd@codeaurora.org>

R:	Stephen Boyd <sboyd@kernel.org>

L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

Makefile

+47 −7
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE 
export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS

export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_KASAN CFLAGS_UBSAN

export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE

export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN

export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE

export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE

export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
@@ -679,6 +680,10 @@ endif 
# This selects the stack protector compiler flag. Testing it is delayed

# until after .config has been reprocessed, in the prepare-compiler-check

# target.

ifdef CONFIG_CC_STACKPROTECTOR_AUTO

  stackp-flag := $(call cc-option,-fstack-protector-strong,$(call cc-option,-fstack-protector))

  stackp-name := AUTO

else

ifdef CONFIG_CC_STACKPROTECTOR_REGULAR

  stackp-flag := -fstack-protector

  stackp-name := REGULAR
@@ -687,16 +692,40 @@ ifdef CONFIG_CC_STACKPROTECTOR_STRONG 
  stackp-flag := -fstack-protector-strong

  stackp-name := STRONG

else

  # If either there is no stack protector for this architecture or

  # CONFIG_CC_STACKPROTECTOR_NONE is selected, we're done, and $(stackp-name)

  # is empty, skipping all remaining stack protector tests.

  #

  # Force off for distro compilers that enable stack protector by default.

  stackp-flag := $(call cc-option, -fno-stack-protector)

  KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)

endif

endif

endif

# Find arch-specific stack protector compiler sanity-checking script.

ifdef CONFIG_CC_STACKPROTECTOR

ifdef stackp-name

ifneq ($(stackp-flag),)

  stackp-path := $(srctree)/scripts/gcc-$(SRCARCH)_$(BITS)-has-stack-protector.sh

  stackp-check := $(wildcard $(stackp-path))

  # If the wildcard test matches a test script, run it to check functionality.

  ifdef stackp-check

    ifneq ($(shell $(CONFIG_SHELL) $(stackp-check) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)

      stackp-broken := y

    endif

  endif

  ifndef stackp-broken

    # If the stack protector is functional, enable code that depends on it.

    KBUILD_CPPFLAGS += -DCONFIG_CC_STACKPROTECTOR

    # Either we've already detected the flag (for AUTO) or we'll fail the

    # build in the prepare-compiler-check rule (for specific flag).

    KBUILD_CFLAGS += $(stackp-flag)

  else

    # We have to make sure stack protector is unconditionally disabled if

    # the compiler is broken (in case we're going to continue the build in

    # AUTO mode).

    KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)

  endif

endif

endif



ifeq ($(cc-name),clang)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
@@ -1091,14 +1120,25 @@ PHONY += prepare-compiler-check 
prepare-compiler-check: FORCE

# Make sure compiler supports requested stack protector flag.

ifdef stackp-name

  # Warn about CONFIG_CC_STACKPROTECTOR_AUTO having found no option.

  ifeq ($(stackp-flag),)

	@echo CONFIG_CC_STACKPROTECTOR_$(stackp-name): \

		  Compiler does not support any known stack-protector >&2

  else

  # Fail if specifically requested stack protector is missing.

  ifeq ($(call cc-option, $(stackp-flag)),)

	@echo Cannot use CONFIG_CC_STACKPROTECTOR_$(stackp-name): \

		  $(stackp-flag) not supported by compiler >&2 && exit 1

  endif

  endif

# Make sure compiler does not have buggy stack-protector support.

ifdef stackp-check

  ifneq ($(shell $(CONFIG_SHELL) $(stackp-check) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)

endif

# Make sure compiler does not have buggy stack-protector support. If a

# specific stack-protector was requested, fail the build, otherwise warn.

ifdef stackp-broken

  ifeq ($(stackp-name),AUTO)

	@echo CONFIG_CC_STACKPROTECTOR_$(stackp-name): \

                  $(stackp-flag) available but compiler is broken: disabling >&2

  else

	@echo Cannot use CONFIG_CC_STACKPROTECTOR_$(stackp-name): \

                  $(stackp-flag) available but compiler is broken >&2 && exit 1

  endif

arch/Kconfig

+7 −9
Original line number Diff line number Diff line
@@ -538,16 +538,10 @@ config HAVE_CC_STACKPROTECTOR 
	  - its compiler supports the -fstack-protector option

	  - it has implemented a stack canary (e.g. __stack_chk_guard)



config CC_STACKPROTECTOR

	def_bool n

	help

	  Set when a stack-protector mode is enabled, so that the build

	  can enable kernel-side support for the GCC feature.



choice

	prompt "Stack Protector buffer overflow detection"

	depends on HAVE_CC_STACKPROTECTOR

	default CC_STACKPROTECTOR_NONE

	default CC_STACKPROTECTOR_AUTO

	help

	  This option turns on the "stack-protector" GCC feature. This

	  feature puts, at the beginning of functions, a canary value on
@@ -564,7 +558,6 @@ config CC_STACKPROTECTOR_NONE 


config CC_STACKPROTECTOR_REGULAR

	bool "Regular"

	select CC_STACKPROTECTOR

	help

	  Functions will have the stack-protector canary logic added if they

	  have an 8-byte or larger character array on the stack.
@@ -578,7 +571,6 @@ config CC_STACKPROTECTOR_REGULAR 


config CC_STACKPROTECTOR_STRONG

	bool "Strong"

	select CC_STACKPROTECTOR

	help

	  Functions will have the stack-protector canary logic added in any

	  of the following conditions:
@@ -596,6 +588,12 @@ config CC_STACKPROTECTOR_STRONG 
	  about 20% of all kernel functions, which increases the kernel code

	  size by about 2%.



config CC_STACKPROTECTOR_AUTO

	bool "Automatic"

	help

	  If the compiler supports it, the best available stack-protector

	  option will be chosen.



endchoice



config THIN_ARCHIVES

arch/arm/include/asm/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ static inline int find_next_bit_le(const void *p, int size, int offset) 


#endif



#include <asm-generic/bitops/find.h>

#include <asm-generic/bitops/le.h>



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE