Messages in this thread | | | Date | Thu, 24 Apr 2014 15:38:24 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in mm/memory.c between commit 1b17844b29ae ("mm: make fixup_user_fault() check the vma access rights too") from Linus' tree and commit 0d84be787c23 ("mm: move get_user_pages()-related code to separate file") from the akpm-current tree.
I fixed it up (I applied Linus' patch to the new file) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |