lkml.org 
[lkml]   [2023]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the net-next tree with the asm-generic tree
Hi all,

On Fri, 9 Jun 2023 10:40:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> fs/netfs/iterator.c
>
> between commit:
>
> ee5971613da3 ("netfs: Pass a pointer to virt_to_page()")
>
> from the asm-generic tree and commit:
>
> f5f82cd18732 ("Move netfs_extract_iter_to_sg() to lib/scatterlist.c")
>
> from the net-next tree.
>
> I fixed it up (I used the file from the former and applied the patch
^^^^^^ latter

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2023-06-09 03:44    [W:0.043 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site