From: Arnd Bergmann <arnd@arndb.de>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>,
"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@jcrosoft.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the staging tree
Date: Wed, 16 May 2012 13:41:47 +0000 [thread overview]
Message-ID: <201205161341.47440.arnd@arndb.de> (raw)
In-Reply-To: <20120516131021.GA32351@kroah.com>
On Wednesday 16 May 2012, Greg KH wrote:
> On Wed, May 16, 2012 at 01:03:34PM +0000, Arnd Bergmann wrote:
> > The staging tree version adds contents to at91sam9g20.dtsi, and the context
> > gets moved to at91sam9260.dtsi in arm-soc. If we want to resolve it now,
> > I think the best way is to add the change to at91sam9260.dtsi in arm-soc
> > and let you drop that part in staging. There are no hard dependencies
> > since this is new code and it the driver is still correct without the
> > change, it simply won't find the device.
>
> Ok, so if we leave it as-is for now, we can resolve it after 3.5-rc1 is
> out and we see what branch ended up "winning"? :)
Yes, works for me.
Arnd
next prev parent reply other threads:[~2012-05-16 13:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 8:58 linux-next: manual merge of the arm-soc tree with the staging tree Stephen Rothwell
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 12:48 ` Greg KH
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:10 ` Greg KH
2012-05-16 13:41 ` Arnd Bergmann [this message]
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 14:33 ` Arnd Bergmann
2012-05-16 15:37 ` [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files Nicolas Ferre
2012-05-16 18:50 ` Arnd Bergmann
2012-05-17 15:06 ` Greg KH
2012-05-17 22:44 ` Stephen Rothwell
2012-05-18 13:03 ` Arnd Bergmann
2012-05-21 10:10 ` Nicolas Ferre
2012-05-21 23:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-09-17 9:20 linux-next: manual merge of the arm-soc tree with the staging tree Stephen Rothwell
2012-09-17 20:53 ` Tony Lindgren
2012-10-31 5:19 Stephen Rothwell
2012-10-31 16:16 ` Greg KH
2012-10-31 16:23 ` Tony Lindgren
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=201205161341.47440.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=olof@lixom.net \
--cc=plagnioj@jcrosoft.com \
--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