* linux-next: manual merge of the devicetree tree with the arm64-fixes tree
@ 2021-02-22 3:23 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-02-22 3:23 UTC (permalink / raw)
To: Rob Herring, Catalin Marinas, Will Deacon
Cc: Lakshmi Ramasubramanian, Linux Kernel Mailing List,
Linux Next Mailing List, Rob Herring, qiuguorui1
[-- Attachment #1: Type: text/plain, Size: 861 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-22 3:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22 3:23 linux-next: manual merge of the devicetree tree with the arm64-fixes tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).