Merge Linux 4.4.203-rc2 into 10

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm64/lib/clear_user.S
Simple merge

diff --cc arch/arm64/lib/copy_from_user.S
Simple merge

diff --cc arch/arm64/lib/copy_in_user.S
Simple merge

diff --cc arch/arm64/lib/copy_to_user.S
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc drivers/md/bcache/super.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/core.h
index 233aaa5,a7fab3b..aeeeac2
--- 1/drivers/net/wireless/ath/ath10k/core.h
--- 2/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@@ -862,8 -755,8 +862,9 @@@ struct ath10k 
  
        struct completion install_key_done;
  
+       int last_wmi_vdev_start_status;
        struct completion vdev_setup_done;
 +      struct completion vdev_delete_done;
  
        struct workqueue_struct *workqueue;
        /* Auxiliary workqueue */

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

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

diff --cc drivers/net/wireless/ath/ath10k/wmi.h
index 4892c7d,66148a8..5f8d7e3
--- 1/drivers/net/wireless/ath/ath10k/wmi.h
--- 2/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@@ -6335,12 -5967,14 +6335,18 @@@ struct wmi_ch_info_ev_arg 
        __le32 chan_tx_pwr_range;
        __le32 chan_tx_pwr_tp;
        __le32 rx_frame_count;
 +      __le32 my_bss_rx_cycle_count;
 +      __le32 rx_11b_mode_data_duration;
 +      __le32 tx_frame_cnt;
 +      __le32 mac_clk_mhz;
  };
  
+ /* From 10.4 firmware, not sure all have the same values. */
+ enum wmi_vdev_start_status {
+       WMI_VDEV_START_OK = 0,
+       WMI_VDEV_START_CHAN_INVALID,
+ };
+ 
  struct wmi_vdev_start_ev_arg {
        __le32 vdev_id;
        __le32 req_id;

diff --cc drivers/net/wireless/brcm80211/brcmfmac/p2p.c
Simple merge

diff --cc drivers/spi/spidev.c
Simple merge

diff --cc drivers/video/fbdev/Kconfig
Simple merge

diff --cc drivers/video/fbdev/Makefile
Simple merge

diff --cc include/linux/blkdev.h
index 719428f,e4b9459..58fd06e
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -197,11 -197,13 +197,16 @@@ struct request 
  
        /* for bidi */
        struct request *next_rq;
 +
 +      ktime_t                 lat_hist_io_start;
 +      int                     lat_hist_enabled;
  };
  
+ static inline bool blk_rq_is_passthrough(struct request *rq)
+ {
+       return rq->cmd_type != REQ_TYPE_FS;
+ }
+ 
  static inline unsigned short req_get_ioprio(struct request *req)
  {
        return req->ioprio;

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

diff --cc kernel/printk/printk.c
index 2deedfc,699c18c..3575b20
--- 1/kernel/printk/printk.c
--- 2/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -281,8 -273,13 +281,9 @@@ static u32 clear_idx
  #define LOG_FACILITY(v)               ((v) >> 3 & 0xff)
  
  /* record buffer */
 -#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
 -#define LOG_ALIGN 4
 -#else
  #define LOG_ALIGN __alignof__(struct printk_log)
 -#endif
  #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)
+ #define LOG_BUF_LEN_MAX (u32)(1 << 31)
  static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN);
  static char *log_buf = __log_buf;
  static u32 log_buf_len = __LOG_BUF_LEN;

diff --cc net/mac80211/rc80211_minstrel_ht.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge