Received-SPF: pass (google.com: domain of linux-wireless+bounces-3491-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 13 Feb 2024 11:08:52 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>, Johannes Berg
 <johannes@sipsolutions.net>, Wireless <linux-wireless@vger.kernel.org>,
 "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Johannes Berg <johannes.berg@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@intel.com>, "Rafael J. Wysocki"
 <rafael.j.wysocki@intel.com>
Subject: linux-next: manual merge of the wireless-next tree with the pm tree
Message-ID: <20240213110852.51524899@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/xWx+rnaTt=Lmy3hfd=gt658";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/xWx+rnaTt=Lmy3hfd=gt658
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_th=
ermal_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.

--=20
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=20
 =20
  #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 {

--Sig_/xWx+rnaTt=Lmy3hfd=gt658
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXKsxQACgkQAVBC80lX
0GyuTwf/a8D7+UV9abG8o84U+eYLjKJH0aImG46vrcPW3w1LYfVMNtJ+b7GbnNgC
fJCcFmFcdMHNZ9wxy06qQsbtp78fEsZB+WTwNXQwiZj1btxG6cZggm8w6NC8FnXP
evkAT5DLzOvQPE0jWkURTX7zQWBeGMFeak9zScx2YJy8qTtV+8fbWoDagOt7GZbR
IiIEQiXcyEBTe7cpEJ1iGecR3+ekZ4h+luiRigfm3zBc7NrUmO404/kBw2M1JpZ2
tw7A7Yg1jzSFYQKkgLbb7rAeo9MY8Jz3gQvwiXcsRB4XNMxNLqoK7g5CDZk/SqDJ
wC96Zsr/5E4OQ+ss8e30k3PtmdJWlg==
=mK8G
-----END PGP SIGNATURE-----

--Sig_/xWx+rnaTt=Lmy3hfd=gt658--