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

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.

I fixed it up (the end result of both is to remove HAVE_CLK) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

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