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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230609114338.72c7da7a@canb.auug.org.au>
Date: Fri, 9 Jun 2023 11:43:38 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Arnd Bergmann <arnd@...db.de>
Cc: Networking <netdev@...r.kernel.org>, David Howells
 <dhowells@...hat.com>, Linus Walleij <linus.walleij@...aro.org>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Paolo Abeni <pabeni@...hat.com>
Subject: Re: 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@...b.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

Content of type "application/pgp-signature" skipped