Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/message/fusion/mptlan.c between commit
54e7ff9d6249ba88e393d7fbc8008da9279723be ("trivial: MPT fusion - remove
long dead code") from Linus' tree and commit
7c510e4b730a92cecf94ada45c989d8be0200d47 ("net: convert more to %pM")
from the net tree.
The former just removed some of the code that the latter modified. I
have removed the code and expect the ocnflict will be fixed in your tree
soon.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpQw5haLKJ0K.pgp
Description: PGP signature
