From: Shawn Guo <shawn.guo@freescale.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: "Opensource [Steve Twiss]" <stwiss.opensource@diasemi.com>,
Andrew Lunn <andrew@lunn.ch>, Arnaud Ebalard <arno@natisbad.org>,
DEVICE TREE <devicetree@vger.kernel.org>,
Florian Vaussard <florian.vaussard@epfl.ch>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Guenter Roeck <linux@roeck-us.net>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Jason Cooper <jason@lakedaemon.net>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
Jonathan Cameron <jic23@kernel.org>,
Kumar Gala <galak@codeaurora.org>,
LINUX ARM KERNEL <linux-arm-kernel@lists.infradead.org>,
LINUX KERNEL <linux-kernel@vger.kernel.org>,
LINUX SH <linux-sh@vger.kernel.org>,
Magnus Damm <magnus.damm@gmail.com>,
Mark Brown <broonie@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Martin Fuzzey <mfuzzey@parkeon.com>,
Pawel Moll <pawel.moll@arm.com>,
Philipp Zabel <p.zabel@pengutronix.de>, Rob Herring <robh>
Subject: Re: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation
Date: Mon, 1 Sep 2014 22:35:18 +0800 [thread overview]
Message-ID: <20140901143517.GH3135@dragon> (raw)
In-Reply-To: <20140901133854.GA8796@lee--X1>
On Mon, Sep 01, 2014 at 02:38:54PM +0100, Lee Jones wrote:
> 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 think if there is a conflict, linux-next will firstly report. But,
yes, pulling it in is the safest.
>
> I would suggest for each affected Maintainer to pull this in.
Pulled it into imx/dt branch, thanks.
Shawn
prev parent reply other threads:[~2014-09-01 14:35 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 standardise on 'dlg' Opensource [Steve Twiss]
2014-08-26 9:33 ` 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 consolidation Lee Jones
2014-08-29 9:54 ` Opensource [Steve Twiss]
2014-09-01 13:27 ` Shawn Guo
2014-09-01 13:38 ` Lee Jones
2014-09-01 14:35 ` Shawn Guo [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=20140901143517.GH3135@dragon \
--to=shawn.guo@freescale.com \
--cc=andrew@lunn.ch \
--cc=arno@natisbad.org \
--cc=broonie@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=florian.vaussard@epfl.ch \
--cc=g.liakhovetski@gmx.de \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jason@lakedaemon.net \
--cc=jgunthorpe@obsidianresearch.com \
--cc=jic23@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=magnus.damm@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mfuzzey@parkeon.com \
--cc=p.zabel@pengutronix.de \
--cc=pawel.moll@arm.com \
--cc=stwiss.opensource@diasemi.com \
/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).