From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Rich Felker <dalias@libc.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Mike Rapoport <rppt@linux.ibm.com>
Subject: linux-next: manual merge of the akpm tree with the sh tree
Date: Fri, 5 Jun 2020 16:02:49 +1000 [thread overview]
Message-ID: <20200605160249.0db09812@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/sh/include/asm/pgtable_64.h
between commit:
37744feebc08 ("sh: remove sh5 support")
from the sh tree and patch:
"mm: consolidate pgd_index() and pgd_offset{_k}() definitions"
from the akpm tree.
I fixed it up (the former deleted the file, 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:[~2020-06-05 6:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 6:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-05 6:04 linux-next: manual merge of the akpm tree with the sh tree Stephen Rothwell
2020-06-05 6:01 Stephen Rothwell
2020-06-05 5:59 Stephen Rothwell
2020-06-05 5:57 Stephen Rothwell
2020-06-05 5:53 Stephen Rothwell
2020-06-05 5:47 Stephen Rothwell
2020-06-05 5:42 Stephen Rothwell
2020-06-05 5:39 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=20200605160249.0db09812@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).