From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Ralf Baechle <ralf@linux-mips•org>,
James Hogan <jhogan@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sinan Kaya <okaya@kernel•org>,
Serge Semin <fancer.lancer@gmail•com>
Subject: linux-next: manual merge of the akpm-current tree with the mips tree
Date: Fri, 3 May 2019 18:59:18 +1000 [thread overview]
Message-ID: <20190503185918.7b28aa0d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 813 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/mips/kernel/setup.c
between commit:
b93ddc4f9156 ("mips: Reserve memory for the kernel image resources")
from the mips tree and commit:
68c7c323926b ("mips: replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC")
from the akpm-current tree.
I fixed it up (the former removed the line changed by the latter, so I
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 --]
next reply other threads:[~2019-05-03 8:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 8:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-28 9:29 linux-next: manual merge of the akpm-current tree with the mips tree Stephen Rothwell
2020-05-29 21:15 ` Andrew Morton
2020-05-29 22:55 ` Stephen Rothwell
2018-08-22 2:02 Stephen Rothwell
2016-02-15 5:03 Stephen Rothwell
2015-06-03 9:33 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=20190503185918.7b28aa0d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=fancer.lancer@gmail$(echo .)com \
--cc=jhogan@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=okaya@kernel$(echo .)org \
--cc=ralf@linux-mips$(echo .)org \
/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