From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <gregkh@linuxfoundation.org>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, plagnioj@jcrosoft.com,
maxime.ripard@free-electrons.com, olof@lixom.net,
linux-next@vger.kernel.org
Subject: Re: [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
Date: Fri, 18 May 2012 13:03:28 +0000 [thread overview]
Message-ID: <201205181303.28535.arnd@arndb.de> (raw)
In-Reply-To: <20120518084446.a7b229074ea215fd7bcd1eb8@canb.auug.org.au>
On Thursday 17 May 2012, Stephen Rothwell wrote:
> On Thu, 17 May 2012 08:06:01 -0700 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, May 16, 2012 at 06:50:54PM +0000, Arnd Bergmann wrote:
> > > On Wednesday 16 May 2012, Nicolas Ferre wrote:
> > > > Now that the bulk of at91sam9g20-related nodes are located in at91sam9260.dtsi,
> > > > we have to re-create the path to this ADC node for SoC specific parts.
> > > >
> > > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > >
> > > Should we apply this patch in arm-soc so that Greg can drop the hunk that
> > > no longer applies?
> >
> > It's not a "no longer applies", it's a "this does not merge". The patch
> > is in my tree, unless you want me to revert it, it's going to stay there
> > until it goes to Linus.
>
> Just apply the patch to the arm-soc tree - then the merge resolution
> becomes "use the arm-soc version". There is no need for Greg to revert
> the other patch.
>
Yes, good point.
I've applied the patch on the at91/dt branch now.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
Date: Fri, 18 May 2012 13:03:28 +0000 [thread overview]
Message-ID: <201205181303.28535.arnd@arndb.de> (raw)
In-Reply-To: <20120518084446.a7b229074ea215fd7bcd1eb8@canb.auug.org.au>
On Thursday 17 May 2012, Stephen Rothwell wrote:
> On Thu, 17 May 2012 08:06:01 -0700 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, May 16, 2012 at 06:50:54PM +0000, Arnd Bergmann wrote:
> > > On Wednesday 16 May 2012, Nicolas Ferre wrote:
> > > > Now that the bulk of at91sam9g20-related nodes are located in at91sam9260.dtsi,
> > > > we have to re-create the path to this ADC node for SoC specific parts.
> > > >
> > > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > >
> > > Should we apply this patch in arm-soc so that Greg can drop the hunk that
> > > no longer applies?
> >
> > It's not a "no longer applies", it's a "this does not merge". The patch
> > is in my tree, unless you want me to revert it, it's going to stay there
> > until it goes to Linus.
>
> Just apply the patch to the arm-soc tree - then the merge resolution
> becomes "use the arm-soc version". There is no need for Greg to revert
> the other patch.
>
Yes, good point.
I've applied the patch on the at91/dt branch now.
Arnd
next prev parent reply other threads:[~2012-05-18 13:06 UTC|newest]
Thread overview: 35+ 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 8:58 ` Stephen Rothwell
2012-05-16 8:58 ` Stephen Rothwell
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 12:48 ` Greg KH
2012-05-16 12:48 ` Greg KH
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:10 ` Greg KH
2012-05-16 13:10 ` Greg KH
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 14:33 ` Arnd Bergmann
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 15:37 ` Nicolas Ferre
2012-05-16 15:37 ` Nicolas Ferre
2012-05-16 18:50 ` Arnd Bergmann
2012-05-16 18:50 ` Arnd Bergmann
2012-05-17 15:06 ` Greg KH
2012-05-17 15:06 ` Greg KH
2012-05-17 22:44 ` Stephen Rothwell
2012-05-17 22:44 ` Stephen Rothwell
2012-05-18 13:03 ` Arnd Bergmann [this message]
2012-05-18 13:03 ` Arnd Bergmann
2012-05-21 10:10 ` Nicolas Ferre
2012-05-21 10:10 ` Nicolas Ferre
2012-05-21 10:10 ` Nicolas Ferre
2012-05-21 23:19 ` Stephen Rothwell
2012-05-21 23:19 ` Stephen Rothwell
2012-05-21 23:19 ` Stephen Rothwell
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=201205181303.28535.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--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=nicolas.ferre@atmel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.