From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: linux-next: manual merge of the mfd tree with the pm tree
Date: Wed, 29 Jul 2015 08:44:19 +0100 [thread overview]
Message-ID: <20150729074419.GG2284@x1> (raw)
In-Reply-To: <20150729122730.1fc9b6a6@canb.auug.org.au>
> Hi Lee,
Morning Stephen.
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/acpi/scan.c
>
> between commit:
>
> 68c6b148daa6 ("ACPI / scan: Move device matching code to bus.c")
>
> from the pm tree and commit:
>
> 712e960f0ee9 ("ACPI / PM: Attach ACPI power domain only once")
>
> from the mfd tree.
I believe this will go away when Rafael pulls [0]
[0] http://www.kernelhub.org/?msg=803290&p=2
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
prev parent reply other threads:[~2015-07-29 7:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-29 2:27 linux-next: manual merge of the mfd tree with the pm tree Stephen Rothwell
2015-07-29 7:44 ` Lee Jones [this message]
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=20150729074419.GG2284@x1 \
--to=lee.jones@linaro.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
--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).