Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
arch/x86/mm/mpx.c
between commit:
a89652769470 ("x86/mpx: Do not set ->vm_ops on MPX VMAs")
from Linus' tree and patch:
"mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()"
from the akpm tree.
I fixed it up (I used the akpm tree version of mpx_map()) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
