Re: [PATCH V7 0/5] TPH and cache direct injection support

[Paolo Abeni]

On 10/3/24 00:08, Michael Chan wrote:
> On Wed, Oct 2, 2024 at 2:35 PM Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
> > I tentatively applied this on pci/tph for v6.13.
> >
> > Not sure what you intend for the bnxt changes, since they depend on
> > the PCI core changes.  I'm happy to merge them via PCI, given acks
> > from Michael and an overall network maintainer.
>
> The bnxt patch can go in through the PCI tree if Jakub agrees.  Thanks.

I guess the most critical point is to avoid complex conflict at merge 
window time. My understanding it that the conventional way to avoid such 
issue would be sharing a stable branch somewhere with this change on top 
which both the netdev and the PCI tree could pull from.

Cheers,

Paolo