From: Lee Jones <lee.jones@linaro•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Grant Likely <grant.likely@secretlab•ca>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>,
Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Pantelis Antoniou <pantelis.antoniou@konsulko•com>,
Romain Perier <romain.perier@gmail•com>
Subject: Re: linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees
Date: Thu, 27 Nov 2014 08:49:02 +0000 [thread overview]
Message-ID: <20141127084902.GC4628@x1> (raw)
In-Reply-To: <20141126154406.434ab873@canb.auug.org.au>
> Today's linux-next merge of the devicetree tree got a conflict in
> include/linux/of.h between commits b31384fa5de3 ("Driver core: Unified
> device properties interface for platform firmware") from the pm tree
> and a4b4e0461ec5 ("of: Add standard property for poweroff capability")
> from the mfd and regulator trees and commit 7518b5890d8a ("of/overlay:
> Introduce DT overlay support") from the devicetree tree.
This patch actually originated from the Regulator tree. I pulled it in
to avoid conflicts between MFD and Regulator. I guess OF needs to do
the same to avoid a conflict when Linus pulls them in.
[...]
--
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:[~2014-11-27 8:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 4:44 linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees Stephen Rothwell
2014-11-27 8:49 ` 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=20141127084902.GC4628@x1 \
--to=lee.jones@linaro$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pantelis.antoniou@konsulko$(echo .)com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=romain.perier@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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