From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Feng Tang <feng.tang@intel.com>
Subject: Re: linux-next: manual merge of the pm tree with the pci tree
Date: Fri, 16 Nov 2012 11:17:02 +0100 [thread overview]
Message-ID: <1551022.HZcUtXAPiN@vostro.rjw.lan> (raw)
In-Reply-To: <CAErSpo7=wZUi4mB4N-pAWzRsyineRFh-W2NtZgAPJe5pNWUayA@mail.gmail.com>
On Tuesday, November 06, 2012 09:52:40 AM Bjorn Helgaas wrote:
> On Mon, Nov 5, 2012 at 7:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 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.
next prev parent reply other threads:[~2012-11-16 10:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-06 2:48 linux-next: manual merge of the pm tree with the pci tree Stephen Rothwell
2012-11-06 16:52 ` Bjorn Helgaas
2012-11-16 10:17 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-10 0:28 Stephen Rothwell
2013-01-10 13:12 ` Rafael J. Wysocki
2013-01-10 18:30 ` Bjorn Helgaas
2013-01-30 8:35 Stephen Rothwell
2013-01-30 12:48 ` Rafael J. Wysocki
2013-02-15 1:23 Stephen Rothwell
2013-02-15 12:51 ` Rafael J. Wysocki
2013-02-18 1:11 Stephen Rothwell
2013-02-18 12:30 ` Rafael J. Wysocki
2013-02-18 1:17 Stephen Rothwell
2013-02-18 12:28 ` Rafael J. Wysocki
2013-02-20 1:55 Stephen Rothwell
2013-02-20 12:57 ` Rafael J. Wysocki
2013-04-16 2:46 Stephen Rothwell
2013-04-16 17:53 ` Rafael J. Wysocki
2013-06-27 3:02 Stephen Rothwell
2015-02-11 1:07 Stephen Rothwell
2015-02-11 1:41 ` Rafael J. Wysocki
2015-02-11 2:03 ` Rafael J. Wysocki
2015-02-11 2:05 ` Lorenzo Pieralisi
2019-07-01 3:24 Stephen Rothwell
2019-11-24 23:13 Stephen Rothwell
2019-11-25 14:06 ` Rafael J. Wysocki
2019-11-27 23:58 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1551022.HZcUtXAPiN@vostro.rjw.lan \
--to=rjw@sisk.pl \
--cc=bhelgaas@google.com \
--cc=feng.tang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox