Re: linux-next: manual merge of the block tree with the vfs tree

[Stephen Rothwell]

Hi Al,

On Fri, 15 Jul 2022 02:04:02 +0100 Al Viro <viro@xxxxxxxxxxxxxxxxxx> wrote:
>
> On Fri, Jul 15, 2022 at 01:52:25AM +0100, Al Viro wrote:
> 
> > Ones from Keith's branch - #alignment-fixes-rebased in there.  Looks like
> > one of the commits in it got changed since then - the difference in
> > __bio_iov_iter_get_pages() (unsigned int i initialization).
> > 
> > Sigh...  I'll rebase on top of that.  
> 
> Rebased and pushed out (with copy_pipe_to_iter() fix folded in as well)

BTW, these still cause a conflict.  As long as you are sharing patches
(and then adding changes to the same areas), there will be conflicts.
You need to share commits i.e. a shared branch.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp4cKQL5eQXz.pgp
Description: OpenPGP digital signature