Messages in this thread | | | Date | Mon, 11 May 2020 09:24:48 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |