From: Mark Brown <broonie@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the akpm-current tree with the tree
Date: Thu, 3 Dec 2015 00:23:07 +0000 [thread overview]
Message-ID: <20151203002307.d8c111a934be800886ebf5b7@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/mm/pgtable.c between commit d6ccc3ec95251d8d327 ("x86/paravirt:
Remove paravirt ops pmd_update[_defer] and pte_update_defer") from the tip tree
and commit cc5bc0810343b ("x86, thp: remove infrastructure for handling
splitting PMDs") from the akpm-current tree.
I fixed it up by removing pmdp_splitting_flush and can carry the fix as
necessary (no action is required). No diff seems to have been generated which
is confusing me a bit.
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
next reply other threads:[~2015-12-03 0:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 0:23 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-01-21 7:14 linux-next: manual merge of the akpm-current tree with the tree Stephen Rothwell
2014-09-03 16:23 Mark Brown
2014-09-01 22:54 Mark Brown
2014-05-29 9:04 Stephen Rothwell
2013-02-22 3:46 Stephen Rothwell
2012-11-15 6:25 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=20151203002307.d8c111a934be800886ebf5b7@kernel.org \
--to=broonie@kernel.org \
--cc=akpm@linux-foundation.org \
--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).