Merge Linux 4.4.203 into 10

diff --cc Makefile
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/wmi.h
index 5f8d7e3,66148a8..614c32e
--- 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,18 -5967,14 +6335,24 @@@ 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,
  };
  
+ /* 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;