linux-next: manual merge of the gpio-brgl tree with the gpio-intel-fixes tree

[Mark Brown]

Hi all,

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

  drivers/gpio/gpiolib-acpi-quirks.c

between commit:

  8d37f20173a27 ("gpiolib: acpi: Add quirk for Lenovo IdeaPad Slim 3 15ABR8")

from the gpio-intel-fixes tree and commit:

  1900b5a41493e ("gpiolib: acpi: Add ignore_wake quirk for ASUS ZenBook UX425UA_UM425UA")

from the gpio-brgl 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 --cc drivers/gpio/gpiolib-acpi-quirks.c
index 22c5fb1493778,dd4db58d36ad0..0000000000000
--- a/drivers/gpio/gpiolib-acpi-quirks.c
+++ b/drivers/gpio/gpiolib-acpi-quirks.c
@@@ -392,19 -392,19 +392,32 @@@ static const struct dmi_system_id gpiol
  			.ignore_wake = "VEN_0488:00@355",
  		},
  	},
 +	{
 +		/*
 +		 * Lenovo IdeaPad Slim 3 15ABR8: the touchscreen wake IRQ fires as soon
 +		 * as the system enters suspend, causing an immediate spurious resume.
 +		 */
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "82XM"),
 +		},
 +		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
 +			.ignore_wake = "GTCH7503:00@10",
 +		},
 +	},
+ 	{
+ 		/*
+ 		 * Spurious wakeups from GPP3 PCIe bridge interrupt
+ 		 * Found in BIOS UX425UA.301
+ 		 */
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA_UM425UA"),
+ 		},
+ 		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
+ 			.ignore_wake = "AMDI0030:00@24",
+ 		},
+ 	},
  	{} /* Terminating entry */
  };

Attachment: signature.asc
Description: PGP signature