Received-SPF: pass (google.com: domain of linux-kernel+bounces-14003-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 2 Jan 2024 14:49:24 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>, "Rafael J. Wysocki"
 <rjw@rjwysocki.net>
Cc: Dave Jiang <dave.jiang@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "Rafael J. Wysocki"
 <rafael.j.wysocki@intel.com>
Subject: linux-next: manual merge of the cxl tree with the pm tree
Message-ID: <20240102144924.1fdfa044@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/f6bH5xUlDv/hJA7yK.XU.zQ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/f6bH5xUlDv/hJA7yK.XU.zQ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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/ac=
pi/")

from the pm tree and commit:

  ca53543d8e34 ("acpi: numa: Add helper function to retrieve the performanc=
e 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.

--=20
Cheers,
Stephen Rothwell

diff --cc include/linux/acpi.h
index 118a18b7ff84,8b0761c682f9..000000000000
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -424,13 -425,16 +425,23 @@@ extern int acpi_blacklisted(void)
  extern void acpi_osi_setup(char *str);
  extern bool acpi_osi_is_win8(void);
 =20
 +#ifdef CONFIG_ACPI_THERMAL_LIB
 +int thermal_acpi_active_trip_temp(struct acpi_device *adev, int id, int *=
ret_temp);
 +int thermal_acpi_passive_trip_temp(struct acpi_device *adev, int *ret_tem=
p);
 +int thermal_acpi_hot_trip_temp(struct acpi_device *adev, int *ret_temp);
 +int thermal_acpi_critical_trip_temp(struct acpi_device *adev, int *ret_te=
mp);
 +#endif
 +
+ #ifdef CONFIG_ACPI_HMAT
+ int acpi_get_genport_coordinates(u32 uid, struct access_coordinate *coord=
);
+ #else
+ static inline int acpi_get_genport_coordinates(u32 uid,
+ 					       struct access_coordinate *coord)
+ {
+ 	return -EOPNOTSUPP;
+ }
+ #endif
+=20
  #ifdef CONFIG_ACPI_NUMA
  int acpi_map_pxm_to_node(int pxm);
  int acpi_get_node(acpi_handle handle);

--Sig_/f6bH5xUlDv/hJA7yK.XU.zQ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTh8QACgkQAVBC80lX
0GxdPAgAhA+s3BHKsaU1OvdOYJ4rEh13P2Xvl3m1AR36VmgCbDO6QtLramQl5dW8
V7dpjHs5wJbifzj2HLfhsL/jHFgykZOMvdkBK8N/ZDmW3TQ5xNKbrKWFx7HCSdkg
BgH3OAHkYJI2y5glhMFm4UyBy0uGr7kqzpRzFA21/35q1BRCzlcwJI7qT9tB8Dn1
gyNVfDt0wZrI20cg7EizQyVbraTPzq43xWX3FsnJjyh8XWi4kgR4mp7Q3llJhRld
4UkExckcrVBK2YPAcovWDY1RGVoO5nHlQVgSg8xk5Q91RvdNYmRXqU0tR/WNg9mc
cb1MeiKVjgq9Nuny8pt0WjYsSZbAkQ==
=OyXZ
-----END PGP SIGNATURE-----

--Sig_/f6bH5xUlDv/hJA7yK.XU.zQ--