On Thu, Jul 03 2025 at 23:00, Nam Cao wrote: > On Thu, Jul 03, 2025 at 08:15:07PM +0000, Michael Kelley wrote: >> which is in netdev/net-next. > > I need some guidance here. If I make it apply cleanly to linux-next, it > won't apply to pci tree. > > I saw this type of conflict being resolved during merging to Linus's tree. > Shouldn't we do the same for this case? There are many ways to skin a cat. See my other reply.
