From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consol
Date: Mon, 01 Sep 2014 13:38:54 +0000 [thread overview]
Message-ID: <20140901133854.GA8796@lee--X1> (raw)
In-Reply-To: <20140901132736.GG3135@dragon>
On Mon, 01 Sep 2014, Shawn Guo wrote:
> On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> > IMX and R8 sub-arch Maintainers,
> >
> > The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> >
> > Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> >
> > for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> >
> > devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> >
> > ----------------------------------------------------------------
> > Immutable branch between MFD and some ARM sub-arch maintainers.
>
> I assume that I need to pull it into my tree only when it turns out
> there are merge conflicts, but otherwise it can just go through your
> tree, right?
If someone realises there's a conflict the chances are we've already
hacked someone off. If the first person to realise is Linus during
the merge-window, you'd have to go to the effort of re-spinning your
pull-request. Something else you'd probably like to avoid.
I would suggest for each affected Maintainer to pull this in.
> > ----------------------------------------------------------------
> > Steve Twiss (1):
> > devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'
> >
> > .../devicetree/bindings/i2c/trivial-devices.txt | 2 +-
> > .../devicetree/bindings/regulator/da9210.txt | 4 ++--
> > .../devicetree/bindings/vendor-prefixes.txt | 1 +
> > arch/arm/boot/dts/imx53-smd.dts | 2 +-
> > arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +-
> > arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
> > arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
> > drivers/mfd/da9055-core.c | 26 +++++++++++-----------
> > 8 files changed, 21 insertions(+), 20 deletions(-)
> >
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2014-09-01 13:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-22 14:26 [RESEND PATCH V2] devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardi Opensource [Steve Twiss]
2014-08-26 9:33 ` [RESEND PATCH V2] devicetree: Dialog Semiconductor consolidate existing vendor prefixes to stand Lee Jones
2014-08-26 10:54 ` Opensource [Steve Twiss]
2014-08-29 9:13 ` [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidat Lee Jones
2014-08-29 9:54 ` [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consol Opensource [Steve Twiss]
2014-09-01 13:27 ` Shawn Guo
2014-09-01 13:38 ` Lee Jones [this message]
2014-09-01 14:35 ` Shawn Guo
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=20140901133854.GA8796@lee--X1 \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).