linux-kernel - Re: [GIT PULL 4/5] ARM: More device tree support updates

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFy4QNiDTL2b37Y870kZ-09sFp9qsFn+SaKCbzWqm8xtoQ@mail.gmail.com>
Date:	Wed, 28 Mar 2012 12:36:39 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Olof Johansson <olof@...om.net>
Cc:	arm@...nel.org, linux-arm-kernel@...ts.infradead.org,
	linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL 4/5] ARM: More device tree support updates

On Wed, Mar 28, 2012 at 12:14 AM, Olof Johansson <olof@...om.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.

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.

                     Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/