Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
drivers/net/ethernet/via/via-rhine.c
between commit:
a7e4fbbfdf79 ("net: via: via-rhine: use %p to format void * address instead of %x")
from Linus' tree and commit:
68fef306c2a5 ("via: trivial sparse annotations")
from the vfs tree.
I fixed it up (I used the version of the netdev_info line change from
Linus' tree) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
