Skip to contentSkip to conversation

linux-next: manual merge of the staging tree with the staging.current tree

DISCUSSION Stephen Rothwell 2 participants 2 messages Sep 22, 2021 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

Today's linux-next merge of the staging tree got a conflict in:

drivers/staging/r8188eu/os_dep/ioctl_linux.c

between commit:

aa3233ea7bdb ("staging: r8188eu: fix -Wrestrict warnings")

from the staging.current tree and commit:

7bdedfef085b ("staging: r8188eu: Remove mp, a.k.a. manufacturing process, code")

from the staging tree.

I fixed it up (the latter removed the code updated by the former, so I did that) 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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 14 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the staging tree got a conflict in:

drivers/staging/r8188eu/os_dep/ioctl_linux.c

between commit:

aa3233ea7bdb ("staging: r8188eu: fix -Wrestrict warnings")

from the staging.current tree and commit:

7bdedfef085b ("staging: r8188eu: Remove mp, a.k.a. manufacturing process, code")

Quoted 8 lines

from the staging tree.

I fixed it up (the latter removed the code updated by the former, so I did that) 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.

Thanks, I'll resolve this when merging the branches together :)

greg k-h