From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Xen Devel <Xen-devel@lists.xensource.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Octavian Purdila <octavian.purdila@intel.com>,
Shannon Zhao <shannon.zhao@linaro.org>
Subject: Re: linux-next: manual merge of the xen-tip tree with the pm tree
Date: Tue, 12 Jul 2016 14:14:21 +0200 [thread overview]
Message-ID: <2723893.NgNEmdq9TU@vostro.rjw.lan> (raw)
In-Reply-To: <20160712140926.49958101@canb.auug.org.au>
On Tuesday, July 12, 2016 02:09:26 PM Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
> drivers/acpi/scan.c
>
> between commit:
>
> 68bdb6773289 ("ACPI: add support for ACPI reconfiguration notifiers")
>
> from the pm tree and commit:
>
> c8ac8b6fb495 ("Xen: ACPI: Hide UART used by Xen")
>
> from the xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks Stehpen!
Best,
Rafael
next prev parent reply other threads:[~2016-07-12 12:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 4:09 linux-next: manual merge of the xen-tip tree with the pm tree Stephen Rothwell
2016-07-12 12:14 ` Rafael J. Wysocki [this message]
2016-07-12 15:31 ` Stefano Stabellini
2022-05-23 6:30 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=2723893.NgNEmdq9TU@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=Xen-devel@lists.xensource.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=octavian.purdila@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=shannon.zhao@linaro.org \
--cc=sstabellini@kernel.org \
/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).