Hi all,
Today's linux-next merge of the stackprotector tree got a conflict in
arch/x86/kernel/setup_percpu.c between various commits from the x86 tree
and commit 18e7651254221ad0d3cf993cce742858c4521c55 ("manual merge of
stackprotector") from the stackprotector tree.
I just used the version of this file from tip/master.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpuqCHC985HW.pgp
Description: PGP signature
