[lkml]   [2022]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the block tree with the vfs tree
Hi Al,

On Fri, 15 Jul 2022 02:04:02 +0100 Al Viro <> 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2022-07-18 05:00    [W:0.048 / U:0.672 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site