linux-next: manual merge of the wireless-next tree with the pm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

between commit:

  2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device")

from the pm tree and commit:

  8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index a618824f0b65,83263d510a45..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@@ -537,8 -540,9 +540,8 @@@ struct iwl_mvm_tt_mgmt 
  
  #ifdef CONFIG_THERMAL
  /**
-  *struct iwl_mvm_thermal_device - thermal zone related data
-  * @temp_trips: temperature thresholds for report
+  * struct iwl_mvm_thermal_device - thermal zone related data
+  * @trips: temperature thresholds for report
 - * @fw_trips_index: keep indexes to original array - temp_trips
   * @tzone: thermal zone device data
  */
  struct iwl_mvm_thermal_device {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]