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

On Tuesday, November 06, 2012 09:52:40 AM Bjorn Helgaas wrote:

On Mon, Nov 5, 2012 at 7:48 PM, Stephen Rothwell [off-list ref] wrote:

quoted

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).

My opinion was that we should just drop the CheckPoint quirk.  See
https://bugzilla.kernel.org/show_bug.cgi?id=47981#c36 for my
rationale.

OK, I agree.  I'll revert that commit, then.

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.