Hi all,
Today's linux-next merge of the x86 tree got a trivial conflict in
include/asm-x86/pda.h between commit
af9ff7868f0f76d3364351b1641b9dfa99588e77 ("x86: simplify stackprotector
self-check") from the stackprotector tree and commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree.
I fixed it up.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpOMubZAkvWI.pgp
Description: PGP signature
