From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Jonathan Corbet <corbet@lwn.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Laurent Dufour <ldufour@linux.vnet.ibm.com>,
Andrea Parri <andrea.parri@amarulasolutions.com>
Subject: linux-next: manual merge of the akpm-current tree with the jc_docs tree
Date: Wed, 9 May 2018 20:25:26 +1000 [thread overview]
Message-ID: <20180509202508.15c3435a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/features/vm/pte_special/arch-support.txt
between commit:
2bef69a385b4 ("Documentation/features/vm: Remove arch support status file for 'pte_special'")
from the jc_docs tree and commit:
1099dc900e93 ("mm: introduce ARCH_HAS_PTE_SPECIAL")
from the akpm-current tree.
I fixed it up (the former removed 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.
BTW, it would be nice if the the question "Why was this file removed?" was
answered by that jc_docs commit message ... I actually wonder if this
file needs to return (I have no way of knowing).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-05-09 10:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 10:25 Stephen Rothwell [this message]
2018-05-09 13:28 ` linux-next: manual merge of the akpm-current tree with the jc_docs tree Andrea Parri
2018-05-09 13:30 ` Andrea Parri
2018-05-09 14:59 ` Jonathan Corbet
2018-05-09 16:53 ` Andrea Parri
2018-05-09 17:11 ` Jonathan Corbet
2018-05-09 17:35 ` Andrea Parri
-- strict thread matches above, loose matches on Subject: below --
2020-07-14 8:19 Stephen Rothwell
2020-04-22 6:01 Stephen Rothwell
2020-03-11 7:11 Stephen Rothwell
2019-10-02 3:18 Stephen Rothwell
2016-12-14 3:42 Stephen Rothwell
2015-12-31 10:58 Stephen Rothwell
2015-12-31 10:43 Stephen Rothwell
2015-12-31 17:47 ` Elliott, Robert (Persistent Memory)
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=20180509202508.15c3435a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=andrea.parri@amarulasolutions.com \
--cc=corbet@lwn.net \
--cc=ldufour@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).