diff mbox series

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

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

Commit Message

Stephen Rothwell Jan. 2, 2024, 3:49 a.m. UTC 
  Hi all,

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

  include/linux/acpi.h

between commit:

  f47507988145 ("thermal: ACPI: Move the ACPI thermal library to drivers/acpi/")

from the pm tree and commit:

  ca53543d8e34 ("acpi: numa: Add helper function to retrieve the performance attributes")

from the cxl tree.

Dan, thanks for the heads up.

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 include/linux/acpi.h
index 118a18b7ff84,8b0761c682f9..000000000000
--- a/include/linux/acpi.h