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.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
This would avoid merge conflicts in various of David Howell's patches
in my tree.
Thoughts?
On Mon, Feb 20, 2023 at 6:39 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> On Mon, 20 Feb 2023 11:50:56 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > 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.
>
> This is now a conflict between the cifs tree and Linus' tree.
> --
> Cheers,
> Stephen Rothwell
--
Thanks,
Steve
