Merge Linux 4.4.206-rc1 into 10

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm64/kernel/smp.c
index 3b8ecc9,7e90f42..34c8832
--- 1/arch/arm64/kernel/smp.c
--- 2/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -125,11 -115,9 +125,12 @@@ int __cpu_up(unsigned int cpu, struct t
                }
        } else {
                pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
+               return ret;
        }
  
 +#ifdef CONFIG_THREAD_INFO_IN_TASK
 +      secondary_data.task = NULL;
 +#endif
        secondary_data.stack = NULL;
  
        return ret;

diff --cc drivers/block/drbd/drbd_main.c
Simple merge

diff --cc drivers/block/drbd/drbd_nl.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ctrls.c
Simple merge

diff --cc drivers/mtd/ubi/build.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/scan.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/sched/sch_prio.c
Simple merge

diff --cc net/vmw_vsock/af_vsock.c
Simple merge