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

On Fri, 14 Aug 2026 05:20:48 +0000 Selvamani Rajagopal wrote:

quoted

quoted

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.