From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>,
Michael Ellerman <mpe@ellerman•id.au>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Hari Bathini <hbathini@linux•ibm.com>,
Lakshmi Ramasubramanian <nramas@linux•microsoft.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the devicetree tree with the powerpc tree
Date: Thu, 18 Feb 2021 14:48:15 +1100 [thread overview]
Message-ID: <20210218144815.5673ae6f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/powerpc/kexec/elf_64.c
between commit:
2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel")
from the powerpc tree and commit:
130b2d59cec0 ("powerpc: Use common of_kexec_alloc_and_setup_fdt()")
from the devicetree tree.
I can't easily see how to resolve these, so for now I have just used
the latter' changes to this file.
I fixed it up 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 --]
next reply other threads:[~2021-02-18 3:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 3:48 Stephen Rothwell [this message]
2021-02-18 10:44 ` linux-next: manual merge of the devicetree tree with the powerpc tree Michael Ellerman
2021-02-18 11:34 ` Stephen Rothwell
2021-02-18 13:52 ` Rob Herring
2021-02-18 20:31 ` Stephen Rothwell
2021-02-18 23:28 ` Michael Ellerman
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 5:01 Stephen Rothwell
2012-03-13 18:26 ` Grant Likely
2012-03-14 1:53 ` Gavin Shan
2012-03-14 8:29 ` Benjamin Herrenschmidt
2012-03-14 9:02 ` Gavin Shan
2012-02-28 2:06 Stephen Rothwell
2012-02-28 4:38 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210218144815.5673ae6f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hbathini@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=nramas@linux$(echo .)microsoft.com \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox