Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/x86/mm/extable.c
between commit:
548acf19234d ("x86/mm: Expand the exception table logic to allow new handling options")
from the tip tree and commit:
f1cd2c09ff09 ("x86/extable: use generic search and sort routines")
from the akpm-current tree.
I couldn't figure out how to fix this up, so I just dropped the
akpm-current tree patch.
--
Cheers,
Stephen Rothwell
--
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
