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

Paolo, Andrew (or anyone who knows)

What to do for the following error for my submission to the net repo.  I see the following error in patchwork.
     "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

Conflict is due to the changes in the same file, probably overlapping, on both repos. How do we handle such scenarios? Should I wait for net-next changes to get merged to net?

FYI:
https://patchwork.kernel.org/project/netdevbpf/patch/20260812-fix-race-condition-and-crash-v6-1-6cf90f4a271a@onsemi.com/

Sincerely
Selva

> -----Original Message-----
> From: Selvamani Rajagopal via B4 Relay
> <[email protected]>
> Subject: [PATCH net v6 1/4] net: ethernet: oa_tc6: Protect skb pointer used by two
> different kernel instances
> 
> 
> This Message Is From an External Sender
> This message came from outside your organization.
> 
> From: Selvamani Rajagopal <[email protected]>
> 
> Threaded IRQ uses waiting_tx_skb. Transmit path also uses this pointer
> without any mutual exclusion protection. As a result, it might leak skb
> buffer, particularly if threaded IRQ sets disable_traffic true after
> start_xmit already checked and found that disable_traffic being false,
> if they happen to run on different cores.
>