linux-kernel - linux-next: manual merge of the devicetree tree with the arm64-fixes 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]

Date:   Mon, 22 Feb 2021 14:23:30 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>
Cc:     Lakshmi Ramasubramanian <nramas@...ux.microsoft.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>,
        qiuguorui1 <qiuguorui1@...wei.com>
Subject: linux-next: manual merge of the devicetree tree with the
 arm64-fixes tree

Hi all,

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

  arch/arm64/kernel/machine_kexec_file.c

between commit:

  656d1d58d8e0 ("arm64: kexec_file: fix memory leakage in create_dtb() when fdt_open_into() fails")

from the arm64-fixes tree and commit:

  c6844a608e43 ("arm64: Use common of_kexec_alloc_and_setup_fdt()")

from the devicetree tree.

I fixed it up (the latter removed the code updated by the former, 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