Hi Dave,
Today's linux-next merge of the net tree got a conflict in
net/phonet/af_phonet.c between commit
566521d63720ab47576afb85147e5652993bf1e6 ("phonet: fix compilation with
gcc-3.4") from the net-current tree and commit
5c7f0333584128c745fbda845abbe3a32c22d467 ("phonet: sparse annotations of
protocol, remove forward declaration") from the net tree.
I fixed it up (by adding the extra bits from the net-current change) and
assume you will do something similar.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpTzHfv90BKb.pgp
Description: PGP signature
