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
| ||
|
Message-ID: <20221004142909.52b6c288@canb.auug.org.au>
Date: Tue, 4 Oct 2022 14:29:09 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
Cc: broonie@...nel.org, Lee Jones <lee@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the qcom tree
Hi all,
On Fri, 30 Sep 2022 14:06:28 +0200 Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org> wrote:
>
> On 30/09/2022 13:58, broonie@...nel.org wrote:
> >
> > Today's linux-next merge of the mfd tree got a conflict in:
> >
> > Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
>
> Thanks Mark.
>
> > between commit:
> >
> > 4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")
>
> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
>
> > from the qcom tree and commits:
> >
> > f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
> > a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")
>
> This commit depends on the duplicated one (on "Add several devices"), so
> I think all set can stay in MFD and instead Bjorn could drop his copy of
> the commit.
>
> If not, please propagate the merge conflict resolution, but not the one
> from Mark.
>
> Instead result should look like a328ae8504dbc (from MFD tree).
OK, in linux-next, the resolution is now to take the mfd tree version.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists