Re: linux-next: manual merge of the staging tree with the wireless-next tree

[Greg KH]

On Fri, Oct 09, 2026 at 11:39:46PM +0200, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/rtl8723bs/
> 
> between commit:
> 
>   c520f3af7df42 ("staging: rtl8723bs: remove the obsolete driver")
> 
> from the net-next tree and commits:
> 
>   dbc2fa996f446 ("staging: rtl8723bs: Remove manual ifname allocation")
>   eb903412616ff ("staging: rtl8723bs: make rtl8723_dequeue_writeport() return bool")
>   94f8dd8b96b03 ("staging: rtl8723bs: remove unused monitor interface name")
>   0e5058a181451 ("staging: rtl8723bs: rename PHY_ConvertTxPowerLimitToPowerIndex()")
>   36d9b855cf944 ("staging: rtl8723bs: make xmitframe_swencrypt() return void")
>   18a42264074ae ("staging: rtl8723bs: remove unnecessary parentheses around prframe->u.hdr.list")
>   6b4405c0f6001 ("staging: rtl8723bs: align function parameters in aes_decipher")
>   2268c1bf1a861 ("Staging: rtl8723bs: fixed camel case coding style issue.")
>   bbcc68a61f3be ("staging: rtl8723bs: fix block comment style")
> 
> et al from the staging 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.
> 
> (deleted the files)

Yes, deleting all of this is fine, thanks!

greg k-h