netdev - Re: linux-next: manual merge of the net-next tree with the vfs-brauner 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] [day] [month] [year] [list]

Message-ID: <a8af57eb-97dd-406a-8f5f-c4375ca4fce2@wangsu.com>
Date: Fri, 28 Feb 2025 11:36:26 +0800
From: Lin Feng <linf@...gsu.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Christian Brauner <brauner@...nel.org>
Cc: Networking <netdev@...r.kernel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Stefano Jordhani <sjordhani@...il.com>
Subject: Re: linux-next: manual merge of the net-next tree with the
 vfs-brauner tree



On 2/28/25 10:29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   fs/eventpoll.c
> 
> between commit:
> 
>   d3a194d95fc8 ("epoll: simplify ep_busy_loop by removing always 0 argument")
> 
> from the vfs-brauner tree and commit:
> 
>   b9d752105e5f ("net: use napi_id_valid helper")
> 
> from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Hi Stephen,

The conflict fix looks good to me, thanks for handling this!

linfeng