linux-kernel - Re: [GIT PULL 5/7] ARM: SoC driver 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+55aFz1i4M4GYOpPp4UAQPGx7b0PTd9Uv0gctU6EMKe3kb4wA@mail.gmail.com>
Date:	Tue, 17 Feb 2015 09:41:09 -0800
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Olof Johansson <olof@...om.net>
Cc:	ARM SoC <arm@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [GIT PULL 5/7] ARM: SoC driver updates

On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@...om.net> wrote:
>
> Conflicts:
>
> arch/arm/boot/dts/rk3288.dtsi:  add/add: Keep both sides
...

You mixed up the aliases of this pull and the previous DT pull.

Not a real problem, but while resolving the DT aliases (which you
claimed had "No conflicts") I was wondering just what you had been
doing..

                       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/