Hi all,
Today's linux-next merge of the timers tree got a conflict in
include/asm-x86/fixmap_64.h between commit
c1a2f4b10852ce68e70f7e4c53600c36cc63ea45 ("x86: change early_ioremap to
use slots instead of nesting") from Linus' tree and commit
1b0ecef5e7803dff3e3e2c86036c53a67e4fe5d2 ("x86-64: reduce boot fixmap
space") from the timers tree.
Just context. I fixed it up.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpcqfTQScpUe.pgp
Description: PGP signature
