On Thu, Jan 23, 2025 at 10:46:29PM -0800, Jon Pan-Doh wrote:
> On Thu, Jan 23, 2025 at 7:18AM Bowman, Terry <terry.bowman@xxxxxxx> wrote:
> > Can you share the base commit used here? I would like to try the patchset.
>
> Sure, it's 7f5b6a8ec18e3add4c74682f60b90c31bdf849f2 ("Merge tag
> 'pci-v6.13-fixes-3' of
> git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci").
>
> As Karolina pointed out[1], there is a chance of conflicts (e.g. TLP
> log/print consolidation series) with pci/err and pci-next branches.
> The next version will be rebased on top of one of those branches.
Patch sets that are intended to be applied to pci.git should generally
be based on the most recent -rc1 release because pci.git contains
a collection of topic branches (each based on rc1) which are then
merged together to form the pull request for Linus.
Note that there are several other patch sets in flight which target AER:
Terry's CXL error handling (now at v5):
https://lore.kernel.org/linux-pci/20250107143852.3692571-1-terry.bowman@xxxxxxx/
Shuai's endpoint error reporting (now at v2):
https://lore.kernel.org/linux-pci/20241112135419.59491-1-xueshuai@xxxxxxxxxxxxxxxxx/
You may want to double-check that your changes do not collide with
these other in-flight patch sets. Terry's is most far along and
may be applied in the upcoming cycle, though it's unclear to me
whether that'll be through the pci or cxl tree. Probably the former
to avoid merge conflicts?
Thanks,
Lukas
