Hi all,
On Mon, 11 May 2020 09:24:48 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgpCJqbcR3kSq.pgp
Description: OpenPGP digital signature
