diff mbox series

linux-next: manual merge of the cxl tree with the pm tree

Message ID 20231030150551.505a5d7b@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the cxl tree with the pm tree |

Commit Message

Stephen Rothwell Oct. 30, 2023, 4:05 a.m. UTC 
  Hi all,

Today's linux-next merge of the cxl tree got a conflict in:

  drivers/pci/pcie/aer.c

between commit:

  e2abc47a5a1a ("ACPI: APEI: Fix AER info corruption when error status data has multiple sections")

from the pm tree and commit:

  6777877eb7a3 ("PCI/AER: Refactor cper_print_aer() for use by CXL driver module")

from the cxl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff mbox series

Patch

diff --cc drivers/pci/pcie/aer.c
index dcd35993004e,36541bfab688..000000000000
--- a/drivers/pci/pcie/aer.c