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] [day] [month] [year] [list]

Message-ID: <CAOesGMjnUAt5MuXqN19ggT2H8vMQKMvArGx_TgAto2prPNmiXw@mail.gmail.com>
Date:	Tue, 17 Feb 2015 09:57:13 -0800
From:	Olof Johansson <olof@...om.net>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
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 9:41 AM, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
> 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..

Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.


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