Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc Config.in
index 9bc8e5193b56396fdc82f63bf3105c8f1a178383,93c44e296af2a05f0733231e7870691a8274b43e..1dd2bb36b3bac31a05a9833a70e415ad32f6ba5d
--- 1/Config.in
--- 2/Config.in
+++ b/Config.in
@@@ -683,19 -702,20 +702,20 @@@ menu "Advanced
  
  config BR2_COMPILER_PARANOID_UNSAFE_PATH
        bool "paranoid check of library/header paths"
+       default y
        help
          By default, when this option is disabled, when the Buildroot
-         cross-compiler will encounter an unsafe library or header
-         path (such as /usr/include, or /usr/lib), the compiler will
-         display a warning.
+         cross-compiler will encounter an unsafe library or header path
+         (such as /usr/include, or /usr/lib), the compiler will display
+         a warning.
  
-         By enabling this option, this warning is turned into an
-         error, which will completely abort the build when such
-         unsafe paths are encountered.
+         By enabling this option, this warning is turned into an error,
+         which will completely abort the build when such unsafe paths
+         are encountered.
  
          Note that this mechanism is available for both the internal
 -        toolchain (through gcc and binutils patches) and external
 -        toolchain backends (through the external toolchain wrapper).
 +        toolchain (through the toolchain wrapper and binutils patches)
 +        and external toolchain backends (through the toolchain wrapper).
  
  endmenu
  

diff --cc Config.in.legacy
Simple merge

diff --cc boot/uboot/uboot.mk
Simple merge

diff --cc package/gcc/Config.in.host
Simple merge

diff --cc package/glibc/Config.in
Simple merge

diff --cc package/libinput/libinput.mk
Simple merge

diff --cc package/linux-headers/Config.in.host
index ac89a6b50c6037a2ee717d422d632b9996bafd3b,cc0ab41a403d2644c470aeb2356965bef8a24100..c07455a97bf1bacdc7b9381c1f73f6b91df00c90
--- 1/package/linux-headers/Config.in.host
--- 2/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@@ -214,13 -222,14 +222,14 @@@ config BR2_DEFAULT_KERNEL_HEADER
        default "3.4.112"       if BR2_KERNEL_HEADERS_3_4
        default "3.10.101"      if BR2_KERNEL_HEADERS_3_10
        default "3.12.59"       if BR2_KERNEL_HEADERS_3_12
 -      default "3.14.68"       if BR2_KERNEL_HEADERS_3_14
 -      default "3.18.32"       if BR2_KERNEL_HEADERS_3_18
 +      default "3.14.70"       if BR2_KERNEL_HEADERS_3_14
 +      default "3.18.33"       if BR2_KERNEL_HEADERS_3_18
        default "3.19.8"        if BR2_KERNEL_HEADERS_3_19
        default "4.0.9"         if BR2_KERNEL_HEADERS_4_0
 -      default "4.1.23"        if BR2_KERNEL_HEADERS_4_1
 +      default "4.1.24"        if BR2_KERNEL_HEADERS_4_1
        default "4.2.8"         if BR2_KERNEL_HEADERS_4_2
        default "4.3.6"         if BR2_KERNEL_HEADERS_4_3
 -      default "4.4.9"         if BR2_KERNEL_HEADERS_4_4
 -      default "4.5.3"         if BR2_KERNEL_HEADERS_4_5
 +      default "4.4.11"        if BR2_KERNEL_HEADERS_4_4
 +      default "4.5.5"         if BR2_KERNEL_HEADERS_4_5
+       default "4.6"           if BR2_KERNEL_HEADERS_4_6
        default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

diff --cc package/mpd/Config.in
Simple merge

diff --cc package/mpg123/mpg123.mk
Simple merge

diff --cc package/mplayer/mplayer.mk
Simple merge

diff --cc package/postgresql/postgresql.mk
Simple merge

diff --cc package/samba4/samba4.mk
Simple merge

diff --cc toolchain/toolchain-external/Config.in
Simple merge

diff --cc toolchain/toolchain-external/toolchain-external.hash
Simple merge

diff --cc toolchain/toolchain-external/toolchain-external.mk
Simple merge