Merge tag 'v4.4.207' into 10

diff --cc Makefile
Simple merge

diff --cc arch/arm/include/asm/uaccess.h
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
Simple merge

diff --cc drivers/thermal/thermal_core.c
index 38355d2,a6df077..7bef526
--- 1/drivers/thermal/thermal_core.c
--- 2/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@ -803,13 -396,13 +803,13 @@@ static void thermal_zone_device_set_pol
                                            int delay)
  {
        if (delay > 1000)
 -              mod_delayed_work(system_freezable_wq, &tz->poll_queue,
 +              mod_delayed_work(queue, &tz->poll_queue,
                                 round_jiffies(msecs_to_jiffies(delay)));
        else if (delay)
 -              mod_delayed_work(system_freezable_wq, &tz->poll_queue,
 +              mod_delayed_work(queue, &tz->poll_queue,
                                 msecs_to_jiffies(delay));
        else
-               cancel_delayed_work_sync(&tz->poll_queue);
+               cancel_delayed_work(&tz->poll_queue);
  }
  
  static void monitor_thermal_zone(struct thermal_zone_device *tz)

diff --cc drivers/tty/serial/msm_serial.c
Simple merge

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/gadget/configfs.c
Simple merge

diff --cc drivers/usb/gadget/function/u_serial.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/host/xhci.h
Simple merge

diff --cc drivers/video/hdmi.c
Simple merge

diff --cc drivers/virtio/virtio_balloon.c
Simple merge

diff --cc fs/cifs/file.c
Simple merge

diff --cc fs/fuse/dir.c
Simple merge

diff --cc fs/fuse/fuse_i.h
Simple merge

diff --cc fs/proc/array.c
Simple merge

diff --cc include/linux/dma-mapping.h
Simple merge

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

diff --cc include/linux/regulator/consumer.h
Simple merge

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

diff --cc include/linux/thread_info.h
index 25f861e,897e835..7cd05da
--- 1/include/linux/thread_info.h
--- 2/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@@ -9,17 -9,50 +9,20 @@@
  
  #include <linux/types.h>
  #include <linux/bug.h>
 +#include <linux/restart_block.h>
  
 -#ifdef CONFIG_THREAD_INFO_IN_TASK
 -#define current_thread_info() ((struct thread_info *)current)
 -#endif
 -
 +#ifdef CONFIG_THREAD_INFO_IN_TASK
+ struct timespec;
+ struct compat_timespec;
+ 
  /*
 - * System call restart block.
 + * For CONFIG_THREAD_INFO_IN_TASK kernels we need <asm/current.h> for the
 + * definition of current, but for !CONFIG_THREAD_INFO_IN_TASK kernels,
 + * including <asm/current.h> can cause a circular dependency on some platforms.
   */
 -struct restart_block {
 -      long (*fn)(struct restart_block *);
 -      union {
 -              /* For futex_wait and futex_wait_requeue_pi */
 -              struct {
 -                      u32 __user *uaddr;
 -                      u32 val;
 -                      u32 flags;
 -                      u32 bitset;
 -                      u64 time;
 -                      u32 __user *uaddr2;
 -              } futex;
 -              /* For nanosleep */
 -              struct {
 -                      clockid_t clockid;
 -                      struct timespec __user *rmtp;
 -#ifdef CONFIG_COMPAT
 -                      struct compat_timespec __user *compat_rmtp;
 +#include <asm/current.h>
 +#define current_thread_info() ((struct thread_info *)current)
  #endif
 -                      u64 expires;
 -              } nanosleep;
 -              /* For poll */
 -              struct {
 -                      struct pollfd __user *ufds;
 -                      int nfds;
 -                      int has_timeout;
 -                      unsigned long tv_sec;
 -                      unsigned long tv_nsec;
 -              } poll;
 -      };
 -};
 -
 -extern long do_no_restart_syscall(struct restart_block *parm);
  
  #include <linux/bitops.h>
  #include <asm/thread_info.h>

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

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

diff --cc kernel/module.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/bridge/br_device.c
Simple merge

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

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv4/tcp_timer.c
Simple merge

diff --cc scripts/mod/modpost.c
Simple merge

diff --cc sound/core/pcm_lib.c
Simple merge