From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
Greg KH <greg@kroah.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 10:54:15 +0000 [thread overview]
Message-ID: <201205161054.15610.arnd@arndb.de> (raw)
In-Reply-To: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au>
On Wednesday 16 May 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/at91sam9g20.dtsi between commit 7cb2e629a240 ("ARM:
> AT91: Add ADC driver to the at91sam9g20 dtsi") from the staging tree and
> commit 5b6089cb6f28 ("ARM: at91: add at91sam9260 DT support") from the
> arm-soc tree.
>
> So, I didn't know what to do with this, so I used the arm-soc version of
> this file (effectively throwing away the staging tree change). Hints,
> anyone?
I suspect the addition of the adc node should just go into the
at91sam9260.dtsi file.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the staging tree
Date: Wed, 16 May 2012 10:54:15 +0000 [thread overview]
Message-ID: <201205161054.15610.arnd@arndb.de> (raw)
In-Reply-To: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au>
On Wednesday 16 May 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/at91sam9g20.dtsi between commit 7cb2e629a240 ("ARM:
> AT91: Add ADC driver to the at91sam9g20 dtsi") from the staging tree and
> commit 5b6089cb6f28 ("ARM: at91: add at91sam9260 DT support") from the
> arm-soc tree.
>
> So, I didn't know what to do with this, so I used the arm-soc version of
> this file (effectively throwing away the staging tree change). Hints,
> anyone?
I suspect the addition of the adc node should just go into the
at91sam9260.dtsi file.
Arnd
next prev parent reply other threads:[~2012-05-16 10:54 UTC|newest]
Thread overview: 47+ 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 [this message]
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
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
-- 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 9:20 ` Stephen Rothwell
2012-09-17 9:20 ` Stephen Rothwell
2012-09-17 20:53 ` Tony Lindgren
2012-09-17 20:53 ` Tony Lindgren
2012-10-31 5:19 Stephen Rothwell
2012-10-31 5:19 ` Stephen Rothwell
2012-10-31 5:19 ` Stephen Rothwell
2012-10-31 16:16 ` Greg KH
2012-10-31 16:16 ` Greg KH
2012-10-31 16:23 ` Tony Lindgren
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=201205161054.15610.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 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.