Hi Johannes,
On 13/03/2023 10:13, Johannes Berg wrote:
> On Mon, 2023-03-13 at 09:04 +0100, Matthieu Baerts wrote:
>> FYI, we got a small conflict when merging -net in net-next in the MPTCP
>> tree due to this patch applied in -net:
>>
>> b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")
>>
>> and this one from net-next:
>>
>> cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW
>> timestamping")
>>
>
> Right, overlapping changes/additions.
>
> I suspect there isn't much I can do about it at this point, other than
> merging wireless into wireless-next and then sending a pull request for
> that, but that seems a bit pointless?
I should probably update the text I send in case of conflicts, probably
inspired by the ones from Stephen: as you probably know or guess, the
best is to avoid conflicts. If it is not possible, it is good to add a
few words in the pull request to give instructions on how to fix them.
I don't think there is anything else you can do apart from confirming
the merge resolution looks good to you :)
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
