DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :cc:content-type:content-transfer-encoding;
        b=muRNYzZ3IXnTV5BsdD3InQasHwZENvX4+xI4SFJwcBIGHnBDI2nE41EUNSsaQrDECz
         GmmOGeoS+o5rcXwi5iHgcXGXLOx1ti9933JImoB4B4sgqnw84lCHlMhWzPp297iPFYUM
         h0MuvBm3lCeYy9yy2XO6V0f49weReT9CvD4uY=
MIME-Version: 1.0
In-Reply-To: <20091130164415.f418834b.sfr@canb.auug.org.au>
References: <20091130164415.f418834b.sfr@canb.auug.org.au>
Date: Mon, 30 Nov 2009 13:51:03 +0800
Message-ID: <2375c9f90911292151t2deb8530idd96ce50ced74d80@mail.gmail.com>
Subject: Re: linux-next: manual merge of the sysctl tree with the net tree
From: =?UTF-8?Q?Am=C3=A9rico_Wang?= <xiyou.wangcong@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org, Vlad Yasevich <vladislav.yasevich@hp.com>,
       "David S. Miller" <davem@davemloft.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1770
Lines: 39

On Mon, Nov 30, 2009 at 1:44 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au
>
> 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/