lkml.org 
[lkml]   [2020]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the mips tree with the clk tree
Hi all,

On Mon, 11 May 2020 09:24:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the mips tree got a conflict in:
>
> arch/mips/loongson2ef/Kconfig
>
> between commit:
>
> bbd7ffdbef68 ("clk: Allow the common clk framework to be selectable")
>
> from the clk tree and commit:
>
> c02e96304451 ("mips: loongsoon2ef: remove private clk api")
>
> from the mips tree.

This is now a conflict between Linus' tree and the clk tree.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-06-04 01:57    [W:0.208 / U:1.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site