* linux-next: manual merge of the staging tree with the wireless-next tree
@ 2026-10-09 21:39 Mark Brown
2026-10-10 9:56 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-10-09 21:39 UTC (permalink / raw)
To: Greg KH
Cc: AmirHossein HajiMohammadi, David Miller,
Franco Hector Hugo Montenegro, Greg Kroah-Hartman, Johannes Berg,
Wireless, Hungyu Lin, Jakub Kicinski, Leonardo Martins Martins,
Linux Kernel Mailing List, Linux Next Mailing List, Luka Gejak,
Networking, Paolo Abeni, Ping-Ke Shih, Rishik Yechuri,
Rishik Yechuri, Rishik Yechuri, Siho Kim, Svyatoslav Nikolenko
[-- Attachment #1: Type: text/plain, Size: 1398 bytes --]
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)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the staging tree with the wireless-next tree
2026-10-09 21:39 linux-next: manual merge of the staging tree with the wireless-next tree Mark Brown
@ 2026-10-10 9:56 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2026-10-10 9:56 UTC (permalink / raw)
To: AmirHossein HajiMohammadi, David Miller,
Franco Hector Hugo Montenegro, Johannes Berg, Wireless,
Hungyu Lin, Jakub Kicinski, Leonardo Martins Martins,
Linux Kernel Mailing List, Linux Next Mailing List, Luka Gejak,
Networking, Paolo Abeni, Ping-Ke Shih, Rishik Yechuri,
Rishik Yechuri, Rishik Yechuri, Siho Kim, Svyatoslav Nikolenko
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-10-10 9:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-09 21:39 linux-next: manual merge of the staging tree with the wireless-next tree Mark Brown
2026-10-10 9:56 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®