Hi Eric,
Today's linux-next merge of the sysctl tree got a conflict in
net/decnet/sysctl_net_decnet.c between commit
887e671f324d9898aaedb29a6ece6c853c394067 ("decnet: netdevice refcount
leak") from Linus' tree and commit
f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl net: Remove unused
binary sysctl code") from the sysctl tree.
The latter removed the code (function dn_def_dev_strategy()) modified by
the former, so I just used the latter. I can carry this fix for a while,
but it can be fixed by merging v2.6.32-rc7 (or just the
above commit from Linus' tree - which would merge a much smaller number of
commits) into the sysctl tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp8lrCRFxdoS.pgp
Description: PGP signature
