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. -- 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); +#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_temp); +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_temp); +#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 + #ifdef CONFIG_ACPI_NUMA int acpi_map_pxm_to_node(int pxm); int acpi_get_node(acpi_handle handle);
Attachment:
pgpiYCqJbqhVP.pgp
Description: OpenPGP digital signature