From: Lin Feng <linf@wangsu.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Christian Brauner <brauner@kernel.org>
Cc: Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stefano Jordhani <sjordhani@gmail.com>
Subject: Re: linux-next: manual merge of the net-next tree with the vfs-brauner tree
Date: Fri, 28 Feb 2025 11:36:26 +0800 [thread overview]
Message-ID: <a8af57eb-97dd-406a-8f5f-c4375ca4fce2@wangsu.com> (raw)
In-Reply-To: <20250228132953.78a2b788@canb.auug.org.au>
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
next prev parent reply other threads:[~2025-02-28 3:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 2:29 linux-next: manual merge of the net-next tree with the vfs-brauner tree Stephen Rothwell
2025-02-28 3:36 ` Lin Feng [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-26 2:37 Stephen Rothwell
2025-06-20 2:11 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8af57eb-97dd-406a-8f5f-c4375ca4fce2@wangsu.com \
--to=linf@wangsu.com \
--cc=brauner@kernel.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=sjordhani@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox