Subject: Re: linux-next: manual merge of the net-next tree with the vfs-brauner tree

From: Lin Feng <[email-masked]>
Date: Fri, 28 Feb 2025 11:36:26 +0800

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