From: Kevin Hilman <khilman@linaro.org>
To: Benoit Cousson <bcousson@baylibre.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Javier Martinez Canillas <javier@dowhile0.org>,
Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
Arnd Bergmann <arnd@arndb.de>,
linux-kernel@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 27 Aug 2013 08:01:18 -0700 [thread overview]
Message-ID: <878uznxjnl.fsf@linaro.org> (raw)
In-Reply-To: <521CB046.9070408@baylibre.com> (Benoit Cousson's message of "Tue, 27 Aug 2013 15:57:26 +0200")
Benoit Cousson <bcousson@baylibre.com> writes:
> + Kevin,
>
> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>> On 08/27/2013 03:24 PM, Benoit Cousson wrote:
>>> Hi Sebatian,
>>
>> Hi Benoit,
>>
>>> Yes. DT patches are an endless source of merge conflicts if they are
>>> merge throught different trees.
>>
>> Usually there are small conflicts because two people added / changed a
>> node nearby. This patch turned the .dts file almost upside down.
>
> Yes, that's true.
>
>>> What was discussed with Olof and Arnd during Connect is that we should
>>> avoid merging DT patches outside arm-soc tree to avoid that kind of
>>> situation.
>>
>> I am aware of this now. However these changes belonged together because
>> a) they belonged together and b) would break the driver until the .dts
>> changes and driver code is in-sync.
>> In future I am going to ask you for a topic branch so I can get my
>> changes in one piece without breaking stuff in the middle.
>>
>> What do we do now?
>
> Cannot you just merge the stable arm-soc/dt branch into your branch
> before applying your patches?
Unfortunately, the next/dt branch of arm-soc is not necessarily stable
so should *not* be merged. In fact none of the arm-soc branches should
be considered stable.
As was already mentioned, this should be split up into driver changes
and DTS changes through arm-soc. They'll both merge for v3.12.
BTW, how did this patch get merged without a signoff/ack from the OMAP
DT maintainer in the first place? Hmm, looks like Benoit was not copied
nor was linux-omap or linux-arm-kernel copied in the original mails.
Kevin
next prev parent reply other threads:[~2013-08-27 15:01 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 8:13 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 17:37 ` Greg KH
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:30 ` Greg KH
2013-08-27 19:56 ` Felipe Balbi
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:47 ` Benoit Cousson
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 15:01 ` Kevin Hilman [this message]
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
2013-08-27 16:20 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 6:45 Stephen Rothwell
2013-08-28 17:26 ` Greg KH
2013-08-27 8:24 Stephen Rothwell
2013-08-27 8:21 Stephen Rothwell
2013-08-27 8:18 Stephen Rothwell
2013-06-18 6:12 Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
2013-02-12 3:59 Stephen Rothwell
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:05 Stephen Rothwell
2012-11-27 4:57 Stephen Rothwell
2012-11-27 8:37 ` Arnd Bergmann
2012-11-13 4:20 Stephen Rothwell
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 4:06 Stephen Rothwell
2012-11-13 8:47 ` Nicolas Ferre
2012-09-25 6:56 Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk
2012-09-06 5:42 Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge
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=878uznxjnl.fsf@linaro.org \
--to=khilman@linaro.org \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=bigeasy@linutronix.de \
--cc=greg@kroah.com \
--cc=javier@dowhile0.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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;
as well as URLs for NNTP newsgroup(s).