Merge branch 'next'

Quite some conflicts, so here goes ..

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

diff --cc Config.in
Simple merge

diff --cc Makefile
Simple merge

diff --cc linux/Config.in
index c7bc4d845631e12f3628be2e6c462eea190f1edc,ebcafcc0eeb230476b5af15d57b1d45d908d71ec..43d63c0cd09ece2a2260cd2b15d22299fda2c42f
--- 1/linux/Config.in
--- 2/linux/Config.in
+++ b/linux/Config.in
@@@ -101,15 -96,9 +95,9 @@@ config BR2_LINUX_KERNEL_CUSTOM_REPO_VER
  
  endif
  
- config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
-       string "Path to the local directory"
-       depends on BR2_LINUX_KERNEL_CUSTOM_LOCAL
-       help
-         Path to the local directory with the Linux kernel source code.
- 
  config BR2_LINUX_KERNEL_VERSION
        string
 -      default "4.7" if BR2_LINUX_KERNEL_LATEST_VERSION
 +      default "4.7.2" if BR2_LINUX_KERNEL_LATEST_VERSION
        default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
                if BR2_LINUX_KERNEL_CUSTOM_VERSION
        default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

diff --cc package/Config.in
Simple merge

diff --cc package/ffmpeg/Config.in
index 3a7bfd3122133a4f7390cbc2f816acdcd51231b1,6b7a6e7b1f29154b71805db8e4dae90a81b48e01..a3ca1054d9b4aa379b3d4e1f416a9dd04a8c94c5
--- 1/package/ffmpeg/Config.in
--- 2/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@@ -1,10 -1,7 +1,8 @@@
  config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        bool
        # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
-       # ffmpeg's configure script only supports mips64 (r1) variant
 -      default y if !BR2_nios2
 +      # No support for ARMv7-M in the ARM assembly logic
-       default y if !BR2_nios2 && !BR2_mips_64r2 && !BR2_mips_64r6 && \
-               !BR2_ARM_CPU_ARMV7M
++      default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M
  
  menuconfig BR2_PACKAGE_FFMPEG
        bool "ffmpeg"

diff --cc package/ffmpeg/ffmpeg.mk
index 5a19617992972ab02aa2703cb0d0a5718418f5f9,fe6aa3d0453abd380a718b4490ef9deea4dbb020..a90d437e4fa1a74bd5cffe3e07ad34b660ae1741
--- 1/package/ffmpeg/ffmpeg.mk
--- 2/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@@ -447,15 -444,6 +447,7 @@@ FFMPEG_CONF_OPTS += --disable-mipsfp
  else
  FFMPEG_CONF_OPTS += --enable-mipsfpu
  endif
- 
- ifeq ($(BR2_mips_32r2),y)
- FFMPEG_CONF_OPTS += \
-       --enable-mips32r2
- else
- FFMPEG_CONF_OPTS += \
-       --disable-mips32r2
- endif
 +endif # MIPS
  
  ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
  FFMPEG_CONF_OPTS += --enable-altivec

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

diff --cc package/logrotate/logrotate.hash
index 8dee7156583312e80a17c2dd7d4345dca935593b,ee31f8e05143082bdd944a304f2e000ffcf8a9a8..3003d42547a9509509fd8a5acfdced56a19cd11b
--- 1/package/logrotate/logrotate.hash
--- 2/package/logrotate/logrotate.hash
+++ b/package/logrotate/logrotate.hash
@@@ -1,3 -1,2 +1,3 @@@
  # Locally calculated
- sha256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 logrotate-3.9.2.tar.gz
+ sha256 db63b5932190cba941357c029b595a7fddf43539943aa1e0ca53a96136e4c5d9 logrotate-3.10.0.tar.gz
 +sha256 e0d360908ac506e02f08fa1ad70e17d6985045d8640f383fef8f322886d6e1e1 6a36c105587b07ad14fc937f3ee6e2eb402621a2.patch

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

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

diff --cc package/procps-ng/procps-ng.mk
Simple merge

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