On Thu, Jul 03 2025 at 20:15, Michael Kelley wrote:
> From: Thomas Gleixner <t...@linutronix.de> Sent: Thursday, July 3, 2025 1:00
> PM
>> Does it conflict against the PCI tree?
>
> There's no conflict in the "next" or "for-linus" tags in
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/.
>
> The conflict is with Patch 2 of this series:
>
> https://lore.kernel.org/linux-hyperv/1749650984-9193-1-git-send-email-shradhagu...@linux.microsoft.com/
>
> which is in netdev/net-next.
That's a trivial one. There are two ways to handle it:
1) Take it through the PCI tree and provide a conflict resolution for
linux-next and later for Linus as reference.
2) Route it through the net-next tree with an updated patch.
As there are no further dependencies (aside of the missing export which
is needed anyway) it's obvious to pick #2 as it creates the least
headaches. Assumed that the PCI folks have no objections.
Michael, as you have resolved the conflict already, can you please
either take care of it yourself or provide the resolution here as
reference for Nam?
Thanks,
tglx
