Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1282625 > unrolled thread
| Started by | Mark Brown <broonie@kernel.org> |
|---|---|
| First post | 2015-12-03 01:30 +0100 |
| Last post | 2015-12-03 01:30 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the akpm-current tree with the tree Mark Brown <broonie@kernel.org> - 2015-12-03 01:30 +0100
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-12-03 01:30 +0100 |
| Subject | linux-next: manual merge of the akpm-current tree with the tree |
| Message-ID | <qBpWy-61l-17@gated-at.bofh.it> |
[Multipart message — attachments visible in raw view] — view raw
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.
Back to top | Article view | linux.kernel
csiph-web