From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Aaron Lu <aaron.lu@amd.com>
Subject: Re: linux-next: manual merge of the pm tree with Linus' tree
Date: Fri, 18 May 2012 21:08:01 +0200 [thread overview]
Message-ID: <201205182108.01664.rjw@sisk.pl> (raw)
In-Reply-To: <20120518154800.3b8cae2960234e03bee0101e@canb.auug.org.au>
Hi,
On Friday, May 18, 2012, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/scan.c between commit 5c7dd710f691 ("ACPI / PCI / PM: Fix
> device PM regression related to D3hot/D3cold") from the tree and commit
> 6ef564fd2070 ("ACPI / PM: Evaluate _PS3 when entering D3 Cold") from the
> pm tree.
>
> I fixed it up (by using the version from Linus' tree) and can carry the
> fix as necessary.
Thanks, I'm dropping the conflicting patch from the pm tree.
Rafael
next prev parent reply other threads:[~2012-05-18 19:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 5:48 linux-next: manual merge of the pm tree with Linus' tree Stephen Rothwell
2012-05-18 19:08 ` Rafael J. Wysocki [this message]
2014-08-11 1:41 Stephen Rothwell
2014-08-11 1:43 Stephen Rothwell
2014-08-12 1:11 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2015-11-08 23:45 Stephen Rothwell
2015-11-09 0:46 ` Rafael J. Wysocki
2018-10-29 2:01 Stephen Rothwell
2018-10-30 7:33 ` Rafael J. Wysocki
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=201205182108.01664.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=aaron.lu@amd.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;
as well as URLs for NNTP newsgroup(s).