From: "Américo 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>
Subject: Re: linux-next: manual merge of the sysctl tree with the net tree
Date: Mon, 30 Nov 2009 13:51:03 +0800 [thread overview]
Message-ID: <2375c9f90911292151t2deb8530idd96ce50ced74d80@mail.gmail.com> (raw)
In-Reply-To: <20091130164415.f418834b.sfr@canb.auug.org.au>
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??
next prev parent reply other threads:[~2009-11-30 5:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-30 5:44 linux-next: manual merge of the sysctl tree with the net tree Stephen Rothwell
2009-11-30 5:51 ` Américo Wang [this message]
2009-11-30 6:39 ` Eric W. Biederman
2009-11-30 9:26 ` Américo Wang
2009-11-30 6:41 ` Stephen Rothwell
2009-11-30 9:21 ` Américo Wang
2009-12-01 14:13 ` Vlad Yasevich
-- strict thread matches above, loose matches on Subject: below --
2009-12-04 8:43 Stephen Rothwell
2009-12-04 12:16 ` William Allen Simpson
2009-12-04 12:21 ` Stephen Rothwell
2009-12-04 21:42 ` Eric W. Biederman
2009-12-04 8:36 Stephen Rothwell
2009-12-04 8:50 ` Eric W. Biederman
2009-11-17 8:04 Stephen Rothwell
2009-11-17 9:17 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2375c9f90911292151t2deb8530idd96ce50ced74d80@mail.gmail.com \
--to=xiyou.wangcong@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vladislav.yasevich@hp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox