linux-kernel - Re: linux-next: manual merge of the clk 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] [day] [month] [year] [list]

Message-ID: <56D55506.4050007@atmel.com>
Date:	Tue, 1 Mar 2016 09:38:30 +0100
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Mike Turquette <mturquette@...libre.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	"Olof Johansson" <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>,
	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	Boris BREZILLON <boris.brezillon@...e-electrons.com>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree

Le 01/03/2016 05:00, Stephen Rothwell a écrit :
> Hi all,
> 
> On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>
>> Today's linux-next merge of the clk tree got a conflict in:
>>
>>   drivers/clk/at91/clk-main.c
>>
>> between commit:
>>
>>   99a81706526f ("clk: at91: remove IRQ handling and use polling")
>>
>> from the arm-soc tree and commit:
>>
>>   8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")
>>
>> from the clk tree.
> 
> And the same for drivers/clk/at91/clk-master.c

Stephen,

Both fixes seem good. Thanks!

Bye,
-- 
Nicolas Ferre