From: Arnd Bergmann <arnd@arndb.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Olof Johansson <olof@lixom.net>,
arm@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL 4/5] ARM: More device tree support updates
Date: Wed, 28 Mar 2012 20:58:19 +0000 [thread overview]
Message-ID: <201203282058.20226.arnd@arndb.de> (raw)
In-Reply-To: <CA+55aFy4QNiDTL2b37Y870kZ-09sFp9qsFn+SaKCbzWqm8xtoQ@mail.gmail.com>
On Wednesday 28 March 2012, Linus Torvalds wrote:
> On Wed, Mar 28, 2012 at 12:14 AM, Olof Johansson <olof@lixom.net> wrote:
> >
> > Merge conflicts and proposed solutions:
> >
> > arch/arm/mach-ux500/Kconfig: Two new config options. Keep both.
>
> Guys, I'm seeing merge problems that go way beyond this.
>
> Look at that MACH_U8500 config option. It got renamed to MACH_MOP500,
> but it continues to live in the tree.
>
> This rename conflict happened earlier and I didn't notice (grep for
> it: it's used by a staging driver), so it's already in my pushed out
> tree. But it seems to be getting worse, and your proposed merge
> solution doesn't cover it.
Your solution looks good. I had the MACH_UX500_DT option above U5500
instead of below it in our for-next branch, but either way makes sense.
> I'll try to fix things up, but you need to verify my merge. And you
> guys should have noticed and noted it, rather than leave it to my
> random bumbling about.
Yes, noted for next time. We had a lot of merge conflicts because of
being relatively late in the merge window (this one was purely
self made though), and it's not always easy to decide which ones
to eliminate in advance, leave in or describe the resolution we found.
Since we usually see the same conflicts and resolve them in the
for-next branch, I guess it's easy enough to just always provide
the branch with the resolutions as a help for cases like this one.
Arnd
next prev parent reply other threads:[~2012-03-28 20:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 7:13 [GIT PULL 0/5] Second batch of arm-soc changes Olof Johansson
2012-03-28 7:13 ` [GIT PULL 1/5] ARM: cleanups of io includes Olof Johansson
2012-03-28 8:25 ` Russell King - ARM Linux
2012-03-28 9:05 ` Olof Johansson
2012-03-28 12:34 ` Arnd Bergmann
2012-03-28 19:28 ` Russell King - ARM Linux
2012-03-30 0:09 ` Linus Torvalds
2012-03-30 0:27 ` Olof Johansson
2012-03-30 0:34 ` Olof Johansson
2012-03-28 7:13 ` [GIT PULL 2/5] ARM: More SoC driver updates Olof Johansson
2012-03-28 7:14 ` [GIT PULL 3/5] ARM: More SoC support updates Olof Johansson
2012-03-28 7:14 ` [GIT PULL 4/5] ARM: More device tree " Olof Johansson
2012-03-28 19:36 ` Linus Torvalds
2012-03-28 20:58 ` Arnd Bergmann [this message]
2012-03-28 7:14 ` [GIT PULL 5/5] drivers/clk: common clock framework Olof Johansson
2012-03-28 14:26 ` [GIT PULL 0/5] Second batch of arm-soc changes Rob Herring
2012-03-28 14:59 ` Arnd Bergmann
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=201203282058.20226.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=torvalds@linux-foundation.org \
/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