linux-kernel - Re: linux-next: manual merge of the omap tree with the arm-soc tree

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: <CAOesGMjc+q5ZEFU4GugJT2RCSmhv48DAA8JzuCxf63eEO6tWVQ@mail.gmail.com>
Date:	Tue, 20 Jan 2015 10:24:50 -0800
From:	Olof Johansson <olof@...om.net>
To:	Tony Lindgren <tony@...mide.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Peter Robinson <pbrobinson@...il.com>
Subject: Re: linux-next: manual merge of the omap tree with the arm-soc tree

On Tue, Jan 20, 2015 at 9:10 AM, Tony Lindgren <tony@...mide.com> wrote:
> * Stephen Rothwell <sfr@...b.auug.org.au> [150119 16:12]:
>> Hi Tony,
>>
>> Today's linux-next merge of the omap tree got a conflict in
>> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
>> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
>> tree and commit ac7452cee743 ("ARM: dts: Add minimal support for
>> dm8168-evm") from the omap tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Uhh why is cb612390e546 doing formatting changes all over the place?
> That's a sure way to produce merge conflicts..

It's intentional but a but annoying, yes -- we're resolving them as we
merge in new DT contents so it won't be exposed outside of our tree
(and -next, unfortunately).


-Olof
--
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/