Skip to contentSkip to conversation

linux-next: manual merge of the block tree with the cifs tree

DISCUSSION Stephen Rothwell 2 participants 3 messages Feb 20, 2023 – Feb 21, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi all,

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

fs/cifs/smb2ops.c

between commit:

8378eea2e41f ("cifs: Change the I/O paths to use an iterator rather than a page list")

from the cifs tree and commit:

220ae4a5c2ba ("cifs: use bvec_set_page to initialize bvecs")

from the block tree.

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

Hi all,

Quoted 13 lines · On Mon, 20 Feb 2023 11:50:56 +1100 Stephen Rothwell <[email protected]>…

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

fs/cifs/smb2ops.c

between commit:

8378eea2e41f ("cifs: Change the I/O paths to use an iterator rather than a page list")

from the cifs tree and commit:

220ae4a5c2ba ("cifs: use bvec_set_page to initialize bvecs")

Quoted 8 lines

from the block tree.

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

This is now a conflict between the cifs tree and Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell
#2 lore raw

Should I rebase my cifs for-next branch on Christoph's patch (now in mainline) to make it easier to merge my branch later in the week?

cifs: use bvec_set_page to initialize bvecs
Use the bvec_set_page helper to initialize bvecs.

This would avoid merge conflicts in various of David Howell's patches in my tree.

Thoughts?

Quoted 30 lines · Stephen Rothwell

Hi all,

Quoted 13 lines · On Mon, 20 Feb 2023 11:50:56 +1100 Stephen Rothwell <[email protected]>…

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

fs/cifs/smb2ops.c

between commit:

8378eea2e41f ("cifs: Change the I/O paths to use an iterator rather than a page list")

from the cifs tree and commit:

220ae4a5c2ba ("cifs: use bvec_set_page to initialize bvecs")

Quoted 8 lines

from the block tree.

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

This is now a conflict between the cifs tree and Linus' tree. --
Cheers,
Stephen Rothwell

Signature · 3 lines
Thanks,

Steve