linux-next: manual merge of the devicetree tree with the arm64-fixes tree

[Stephen Rothwell]

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: pgpcYWIObESgT.pgp
Description: OpenPGP digital signature