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

Message-ID: <87y4e5sbr2.fsf@saruman.tx.rr.com>
Date:	Tue, 10 Nov 2015 16:58:09 -0600
From:	Felipe Balbi <balbi@...com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>,
	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 2/6] ARM: SoC cleanups for v4.4


Hi,

Linus Torvalds <torvalds@...ux-foundation.org> writes:
> 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.

correct. Moved from arch/arm/mach-omap2/ to drivers/clocksource/. We're
trying to get all our timer code to drivers/clocksource and make it
DT-only (when all other platforms switch away from legacy boot).

-- 
balbi

Download attachment "signature.asc" of type "application/pgp-signature" (819 bytes)