Search Linux Wireless

Re: pull-request: wireless-2023-03-10: manual merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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?

Jakub, any preferences?

johannes




[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Wireless Regulations]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux