linux-next: manual merge of the mips tree with the clk tree

linux-next: manual merge of the mips tree with the clk tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 769 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mips tree with the clk tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 533 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]