On Tue, 2024-02-13 at 11:08 +1100, Stephen Rothwell wrote:
> 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.
Hah, sorry about that. I told Rafael this was likely not going to
conflict, but didn't see the doc changes ...
I guess we'll have to live with this conflict, unless Rafael you have a
feature branch for this I could pull in and resolve?
johannes
