git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6035ccd) | patch
sctp: fix compile error due to sysctl mismerge
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 20:51:22 +0000 (12:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 20:51:22 +0000 (12:51 -0800)
commita252e749f1ae17e43ccc5824f7b1b5854417c98b
tree0398ece85ef2e5ec63780ec892921a589e7a4d71tree | snapshot
parent6035ccd8e9e40bb654fbfdef325902ab531679a5commit | diff
sctp: fix compile error due to sysctl mismerge

I messed up the merge in d7fc02c7bae7b1cf69269992cf880a43a350cdaa, where
the conflict in question wasn't just about CTL_UNNUMBERED being removed,
but the 'strategy' field is too (sysctl handling is now done through the
/proc interface, with no duplicate protocols for reading the data).

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
net/sctp/sysctl.c diff | blob | history
Full containers within linux kernel