Hi all,
Today's linux-next merge of the cpus4096 tree got a conflict in
arch/x86/kernel/cpu/intel_cacheinfo.c between commit
45ca863a40306ccc99c68d13421b6577240760ca ("x86, cpu: conform L3 Cache
Index Disable to Linux standards") from the x86 tree and commit
ba1d755a36f66101aa88ac9ebb54694def6ec38d ("fix warning in
arch/x86/kernel/cpu/intel_cacheinfo.c") from the cpus4096 tree.
The former removed the code modified by the latter. I fixed it up (by
removing the definition of k8_nb_id) and can carry the fix as necessary.
This fix is different to what appears in tip/master as that tree
currently doesn't appear to have the above x86 tree commit in it.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpCmUluD5pI1.pgp
Description: PGP signature
