linux-kernel - Re: linux-next: manual merge of the samsung-krzk tree with the omap 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] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 03 Mar 2016 08:40:52 +0900
From:	Krzysztof Kozlowski <k.kozlowski@...sung.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Tony Lindgren <tony@...mide.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Michael Turquette <mturquette@...libre.com>,
	James Liao <jamesjj.liao@...iatek.com>,
	Stephen Boyd <sboyd@...eaurora.org>
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the omap
 tree

On 03.03.2016 07:16, Stephen Rothwell wrote:
> Hi Krzysztof,
> 
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
> 
>   drivers/clk/Kconfig
> 
> between commit:
> 
>   21330497f303 ("clk: ti: Add support for dm814x ADPLL")
> 
> from the omap tree and commit:
> 
>   b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
> 
> from the samsung-krzk tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Thanks!

The conflicting commit actually comes from clk tree, merged here as a
dependency for other patches.

Best regards,
Krzysztof