Merge branch 'next'

Conflicts:
	package/gdb/Config.in.host

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

diff --cc Makefile
Simple merge

diff --cc linux/Config.in
Simple merge

diff --cc package/connman/Config.in
index 808323324af10df7618b559b5faff42b62439ffc,ea1fb715fdbd734965214848005591c20e0a95a5..7160905a9425cc8c0678a018bf4cc2219638b119
--- 1/package/connman/Config.in
--- 2/package/connman/Config.in
+++ b/package/connman/Config.in
@@@ -11,11 -10,11 +10,11 @@@ config BR2_PACKAGE_CONNMA
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus, libglib2
        help
-         The Connection Manager (ConnMan) project provides a daemon for
-         managing internet connections within embedded devices running
-         the Linux operating system.
+         The Connection Manager (ConnMan) project provides a daemon
+         for managing internet connections within embedded devices
+         running the Linux operating system.
  
 -        For more information, see http://connman.net/
 +        For more information, see https://01.org/connman
  
  if BR2_PACKAGE_CONNMAN
  

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

diff --cc package/gdb/Config.in.host
index 1ba36649813ef61f58cb5411f410afe17521be45,16a72910a1e2439e7ff5bdfd6f292f1713a495f4..d5954f236d8a471c13b94c3de531a8c070577209
--- 1/package/gdb/Config.in.host
--- 2/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@@ -17,8 -17,10 +17,9 @@@ choic
        prompt "GDB debugger Version"
        depends on !BR2_arc
        depends on !BR2_microblaze
 -      default BR2_GDB_VERSION_6_6 if BR2_bfin
        default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
-       default BR2_GDB_VERSION_7_5
+       default BR2_GDB_VERSION_7_7 if BR2_powerpc64le
+       default BR2_GDB_VERSION_7_6
        help
          Select the version of gdb you wish to use.
  
@@@ -28,9 -34,19 +29,18 @@@
  
        config BR2_GDB_VERSION_7_4
                bool "gdb 7.4.x"
 -              depends on !BR2_bfin && !BR2_powerpc64le
++              depends on !BR2_powerpc64le
  
        config BR2_GDB_VERSION_7_5
                bool "gdb 7.5.x"
 -              depends on !BR2_bfin && !BR2_powerpc64le
++              depends on !BR2_powerpc64le
+ 
+       config BR2_GDB_VERSION_7_6
+               bool "gdb 7.6.x"
 -              depends on !BR2_bfin && !BR2_powerpc64le
++              depends on !BR2_powerpc64le
+ 
+       config BR2_GDB_VERSION_7_7
+               bool "gdb 7.7.x"
 -              depends on !BR2_bfin
  
  endchoice
  

diff --cc toolchain/toolchain-buildroot/Config.in
index 11404e8daac290889381bf98045e59c98868921e,0a96e757b42efc347d9fa6fe3d74cb76646b2a03..e27a4a9960dd5a17619da58281f20feb3330df63
--- 1/toolchain/toolchain-buildroot/Config.in
--- 2/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@@ -59,14 -59,14 +59,15 @@@ config BR2_TOOLCHAIN_BUILDROOT_EGLIB
  
  config BR2_TOOLCHAIN_BUILDROOT_GLIBC
        bool "glibc"
-       depends on BR2_arm    || BR2_armeb    || BR2_aarch64 || \
-                  BR2_i386   || BR2_mips     || BR2_mipsel  || \
-                  BR2_mips64 || BR2_mips64el || BR2_powerpc || \
-                  BR2_sh     || BR2_sh64     || BR2_sparc   || \
-                  BR2_x86_64 || BR2_microblaze
+       depends on BR2_arm         || BR2_armeb    || BR2_aarch64 || \
+                  BR2_i386        || BR2_mips     || BR2_mipsel  || \
+                  BR2_mips64      || BR2_mips64el || BR2_powerpc || \
+                  BR2_powerpc64   || BR2_powerpc64le || BR2_sh   || \
+                  BR2_sh64        || BR2_sparc    || BR2_x86_64  || \
+                  BR2_microblaze
        depends on BR2_USE_MMU
        depends on !BR2_PREFER_STATIC_LIB
 +      depends on !BR2_powerpc_SPE
        select BR2_TOOLCHAIN_USES_GLIBC
        # our glibc.mk enables RPC support
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC