From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Michael Ellerman <mpe@ellerman•id.au>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Christophe Leroy <christophe.leroy@csgroup•eu>,
Kefeng Wang <wangkefeng.wang@huawei•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the akpm tree with the powerpc tree
Date: Mon, 28 Jun 2021 19:56:21 +1000 [thread overview]
Message-ID: <20210628195621.05913135@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 774 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/powerpc/kernel/setup-common.c
between commit:
56afad885228 ("powerpc: Remove klimit")
from the powerpc tree and commit:
6e6e0df2a484 ("powerpc: convert to setup_initial_init_mm()")
from the akpm tree.
I fixed it up (I just used the latter since it had also decided to use
_end directly) 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-06-28 9:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-28 9:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-06 6:39 linux-next: manual merge of the akpm tree with the powerpc tree Stephen Rothwell
2020-03-06 5:29 Stephen Rothwell
2016-11-15 3:52 Stephen Rothwell
2016-08-02 3:39 Stephen Rothwell
2013-06-26 6:56 Stephen Rothwell
2013-06-26 8:10 ` Benjamin Herrenschmidt
2013-06-26 13:13 ` Andrew Morton
2013-06-26 14:19 ` Oleg Nesterov
2013-06-26 21:56 ` Benjamin Herrenschmidt
2012-03-13 9:10 Stephen Rothwell
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=20210628195621.05913135@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=christophe.leroy@csgroup$(echo .)eu \
--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=wangkefeng.wang@huawei$(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