Stephen Rothwell wrote: > Hi Eric, > > Today's linux-next merge of the sysctl tree got a conflict in > net/sctp/sysctl.c between commit 90f2f5318b3a5b0898fef0fec9b91376c7de7a2c > ("sctp: Update SWS avaoidance receiver side algorithm") from the net tree > and commit f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl net: Remove > unused binary sysctl code") from the sysctl tree. > > I fixed it up (see below) and can carry the fix as necessary. I also > removed the strategy member from the new added ctl_table entry. Thanks for fixing this up Stephen. I was basing my work on linux-next which, it appears, didn't have the sysctl changes. -vlad -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html