Hi Eric,
Today's linux-next merge of the sysctl tree got a conflict in
kernel/sysctl_check.c between commit
8153a10c08f1312af563bb92532002e46d3f504a ("ipv4: add sysctl to accept
packets with local source addresses") from the net tree and commit
83ac201b4f06eb8aeb7ac93cf162651ba30e0b28 ("sysctl: Remove dead code from
sysctl_check") from the sysctl tree.
The latter removes the need for the former to change this file. I just
used the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpIgCV57YZRn.pgp
Description: PGP signature
