RE: [PATCH net v6 1/4] net: ethernet: oa_tc6: Protect skb pointer used by two different kernel instances

-----Original Message-----
From: Andrew Lunn <andrew@lunn.ch>
Sent: Thursday, August 13, 2026 11:51 AM
To: Selvamani Rajagopal <redacted>
Subject: Re: [PATCH net v6 1/4] net: ethernet: oa_tc6: Protect skb pointer used by two
different kernel instances


On Thu, Aug 13, 2026 at 03:53:49PM +0000, Selvamani Rajagopal wrote:

quoted

Paolo, Andrew (or anyone who knows)

Paolo can probably give you a better answer...

I assume you are submitting to net, and your patch is based on the
most recent net. So the patch applies cleanly there? This in itself
should not be a problem.

Yes. It is based on recent "net" branch and applies cleanly there.

quoted

What to do for the following error for my submission to the net repo. I see the following

error in patchwork.

quoted

"Conflicts with pending/net patches (net-next-2026-08-13--06-00): error: patch failed:

drivers/net/ethernet/oa_tc6.c:693 error: drivers/net/ethernet/oa_tc6.c: patch does not
apply

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
at it now, and provide the answer?

Out of 24 hunks, 2 fails. Let me check if there is a way to resolve those
by splitting the changes in to smaller patches.

Andrew