| Message ID | 20240213110852.51524899@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | linux-next: manual merge of the wireless-next tree with the pm tree | expand |
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
On 2/13/2024 9:25 AM, Johannes Berg wrote: > 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? Well, not yet, but I can add one if that helps. Cheers!
On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote: > > > > > > 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device") > > > > > > from the pm tree > > 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? > > Well, not yet, but I can add one if that helps. > Well if you have a branch that has the above commit and not too much else, then I could pull it into wireless ... but chances are the common base that we have is divergent enough that'd pull a whole bunch of other things into the tree so that'd not be great. Pretty sure even if the conflict survives to the end Linus could figure it out? :) johannes
On Tue, Feb 13, 2024 at 6:14 PM Johannes Berg <johannes@sipsolutions.net> wrote: > > On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote: > > > > > > > > 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device") > > > > > > > > from the pm tree > > > > 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? > > > > Well, not yet, but I can add one if that helps. > > > > Well if you have a branch that has the above commit and not too much > else, then I could pull it into wireless ... but chances are the common > base that we have is divergent enough that'd pull a whole bunch of other > things into the tree so that'd not be great. On top of 6.8-rc2, there are 3 unrelated commits that you'd need to merge along with the wireless ones. Your call. :-) > Pretty sure even if the conflict survives to the end Linus could figure > it out? :) Agreed.
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index a618824f0b65,83263d510a45..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
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.