linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20200511092448.65c5d790@canb.auug.org.au>
Date:   Mon, 11 May 2020 09:24:48 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>,
        Mike Turquette <mturquette@...libre.com>,
        Stephen Boyd <sboyd@...nel.org>
Cc:     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: 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

Content of type "application/pgp-signature" skipped