Hi all,
Today's linux-next merge of the x86 tree got a conflict in
arch/x86/kernel/genapic_64.c between commit
0d39741a27d86d305cc75ba626392be410dcbab9 ("GRU Driver: export is_uv_system
(), zap_page_range() & follow_page()") from Linus' tree and commit
1b9b89e7f163336ad84200b66a17284dbf26aced ("x86: add apic probe for
genapic 64bit, v2") from the x86 tree.
The former exported a function (is_uv_system) that the latter moved. I
did the export in the new file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpVd0HAHaJ1A.pgp
Description: PGP signature
