From: Jakub Kicinski <kuba@kernel.org>
To: Selvamani Rajagopal <Selvamani.Rajagopal@onsemi.com>
Cc: Andrew Lunn <andrew@lunn.ch>, Paolo Abeni <pabeni@redhat.com>,
Parthiban Veerasooran <parthiban.veerasooran@microchip.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Piergiorgio Beruto <Pier.Beruto@onsemi.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net v6 1/4] net: ethernet: oa_tc6: Protect skb pointer used by two different kernel instances
Date: Fri, 14 Aug 2026 10:36:32 -0700 [thread overview]
Message-ID: <20260814103632.4d620d22@kernel.org> (raw)
In-Reply-To: <DM5PR02MB33697DFABDC38A6C5C0946CD83DA2@DM5PR02MB3369.namprd02.prod.outlook.com>
On Fri, 14 Aug 2026 05:20:48 +0000 Selvamani Rajagopal wrote:
> > > I think this is giving a warning that when net is merged to net-next,
> > > which happens most Thursdays, there is going to be a conflict. How bad
> > > is that conflict? If it is trivial, don't worry, it will get
> > > handled. If the conflict resolution is not obvious, maybe you can look
>
>
> After little investigation, looks like it is trivial issue and mainly it can't be handled by
> rearranging/changing the patches. Issue is the context differs between "net" and "net-next" branch.
> I am hoping that this can be resolved while merging.
>
> In the following example, "net" branch has INT_MASK0_ALL_INTERRUPTS. But it is changed to
> OA_TC6_INT_MASK0_ALL_INTERRUPTS in net-next branch. So, no matter how I move the code around,
> this will not apply cleanly.
Ignore that warning and wait for a human review.
The patchwork warnings are _for maintainers_.
As Andrew explained the best way to avoid this is to upstream fixes
first, but if the conflicting stuff is already in net-next we will
deal with the conflict.
next prev parent reply other threads:[~2026-08-14 17:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-13 3:00 [PATCH net v6 0/4] Fix to possible skb leak due to race condtion in tx path Selvamani Rajagopal via B4 Relay
2026-08-13 3:00 ` [PATCH net v6 1/4] net: ethernet: oa_tc6: Protect skb pointer used by two different kernel instances Selvamani Rajagopal via B4 Relay
2026-08-13 15:53 ` Selvamani Rajagopal
2026-08-13 18:51 ` Andrew Lunn
2026-08-13 21:16 ` Selvamani Rajagopal
2026-08-14 5:20 ` Selvamani Rajagopal
2026-08-14 17:36 ` Jakub Kicinski [this message]
2026-08-13 3:00 ` [PATCH net v6 2/4] net: ethernet: oa_tc6: Improve the error recovery Selvamani Rajagopal via B4 Relay
2026-08-13 3:00 ` [PATCH net v6 3/4] net: ethernet: oa_tc6: Disable tx queues on fatal error Selvamani Rajagopal via B4 Relay
2026-08-13 3:00 ` [PATCH net v6 4/4] net: ethernet: oa_tc6: Fix for the wrong data type Selvamani Rajagopal via B4 Relay
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=20260814103632.4d620d22@kernel.org \
--to=kuba@kernel.org \
--cc=Pier.Beruto@onsemi.com \
--cc=Selvamani.Rajagopal@onsemi.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=parthiban.veerasooran@microchip.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