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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20200604095601.1e88997e@canb.auug.org.au>
Date:   Thu, 4 Jun 2020 09:56:01 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mike Turquette <mturquette@...libre.com>,
        Stephen Boyd <sboyd@...nel.org>
Cc:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Arnd Bergmann <arnd@...db.de>,
        Thomas Bogendoerfer <tsbogend@...ha.franken.de>
Subject: Re: 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@...b.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

Content of type "application/pgp-signature" skipped