Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/x86/pci/acpi.c between commit 3f385fa9edce ("x86/PCI: Ignore _SEG on
HP xw9300") from the pci tree and commit 97a7108a3c00 ("ACPI / x86: Add
quirk for "CheckPoint P-20-00" to not use bridge _CRS_ info") from the pm
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/pci/acpi.c
index 49e5195,7010c19..0000000
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@@ -106,16 -98,16 +106,27 @@@ static const struct dmi_system_id pci_c
  			DMI_MATCH(DMI_BIOS_VERSION, "6JET85WW (1.43 )"),
  		},
  	},
 +
 +	/* https://bugzilla.kernel.org/show_bug.cgi?id=15362 */
 +	{
 +		.callback = set_ignore_seg,
 +		.ident = "HP xw9300",
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "HP xw9300 Workstation"),
 +		},
 +	},
++
+ 	/* https://bugzilla.kernel.org/show_bug.cgi?id=47981 */
+ 	{
+ 		.callback = set_nouse_crs,
+ 		.ident = "CheckPoint P-20-00",
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "CheckPoint"),
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "P-20-00"),
+ 			DMI_MATCH(DMI_BOARD_NAME, "Bridgeport"),
+ 		},
+ 	},
  	{}
  };