Hi Stephen,
On Fri, 2009-01-23 at 15:44 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kmemcheck tree got a conflict in
> arch/x86/mm/fault.c between commit do_page_fault ("x86: optimise x86's
> do_page_fault (C entry point for the page fault path)") from the x86 tree
> and commit 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for
> kmemcheck") from the kmemcheck tree.
>
> I fixed it up (see below) but it is worth a check. I can carry the fix
> as necessary.
Looks good to me. Vegard?
Pekka
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
