linux-kernel - linux-next: manual merge of the clk tree with the qcom 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>] [day] [month] [year] [list]

Message-ID: <20230802100413.199544b8@canb.auug.org.au>
Date:   Wed, 2 Aug 2023 10:04:13 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mike Turquette <mturquette@...libre.com>,
        Stephen Boyd <sboyd@...nel.org>, Andy Gross <agross@...nel.org>
Cc:     Bjorn Andersson <andersson@...nel.org>,
        Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the clk tree with the qcom tree

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/qcom/lcc-mdm9615.c

between commit:

  bac4675a4d1b ("clk: qcom: drop lcc-mdm9615 in favour of lcc-msm8960")

from the qcom tree and commit:

  a96cbb146a97 ("clk: Explicitly include correct DT includes")

from the clk tree.

I fixed it up (the former removed the file, so I just did that) 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