Re: linux-next: manual merge of the net-next tree with the asm-generic tree

[Stephen Rothwell]

Hi all,

On Fri, 9 Jun 2023 10:40:37 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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

Attachment: pgpDBDP_rLWEZ.pgp
Description: OpenPGP digital signature