linux-kernel - linux-next: manual merge of the pm tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121106134826.32a117100825204d48150f0b@canb.auug.org.au>
Date:	Tue, 6 Nov 2012 13:48:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Feng Tang <feng.tang@...el.com>
Subject: linux-next: manual merge of the pm tree with the pci tree

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@...b.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"),
+ 		},
+ 	},
  	{}
  };
  

Content of type "application/pgp-signature" skipped