linux-kernel - Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4

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: <CAOesGMj8T=qJWkR=yF8cVrTZKiRTBhEsqTLO7Rw9kmB-sPUCKw@mail.gmail.com>
Date:	Tue, 10 Nov 2015 15:23:30 -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 2/6] ARM: SoC cleanups for v4.4

On Tue, Nov 10, 2015 at 2:52 PM, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
> On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@...om.net> wrote:
>>
>> Conflicts:
>>
>> OMAP timer code has a treewide fix vs code deletion conflict. Delete
>> the code in HEAD, go with contents from branch.
>
> That doesn't look right. It also needs the clocksource_of_init ->
> clocksource_probe changes. The code was moved around rather than
> deleted.

Argh, yes, of course. I usually build a local copy of the merged
contents on top of your latest tree before sending the pull requests,
but didn't this time.

Thanks for catching this.


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