Hi Dave,
Today's linux-next merge of the net tree got a conflict in
arch/sparc64/kernel/idprom.c between commit
a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
("net: convert more to %pM") from the net tree.
The former renamed the file while the latter modified it. I just deleted
the renamed file for now, the %pM conversion can be done later.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpzR8G1J8O6d.pgp
Description: PGP signature
