summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 21:51:22 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 21:51:22 +0100
commita252e749f1ae17e43ccc5824f7b1b5854417c98b (patch)
tree0398ece85ef2e5ec63780ec892921a589e7a4d71 /init/Kconfig
parentMerge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block (diff)
downloadlinux-a252e749f1ae17e43ccc5824f7b1b5854417c98b.tar.xz
linux-a252e749f1ae17e43ccc5824f7b1b5854417c98b.zip
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>
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions