On Mon, Nov 30, 2009 at 1:44 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc net/sctp/sysctl.c
> index ae03ded,d50a042..0000000
> --- a/net/sctp/sysctl.c
> +++ b/net/sctp/sysctl.c
> @@@ -285,19 -241,7 +242,17 @@@ static ctl_table sctp_table[] =
> .extra1 = &zero,
> .extra2 = &addr_scope_max,
> },
> + {
> - .ctl_name = CTL_UNNUMBERED,
> + .procname = "rwnd_update_shift",
> + .data = &sctp_rwnd_upd_shift,
> + .maxlen = sizeof(int),
> + .mode = 0644,
> - .proc_handler = &proc_dointvec_minmax,
> - .strategy = &sysctl_intvec,
> ++ .proc_handler = proc_dointvec_minmax,
Hey, what's this??
--
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
