Re: linux-next: manual merge of the sysctl tree with the net tree

[AmÃrico Wang]

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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/