From: William Allen Simpson <william.allen.simpson@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,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the sysctl tree with the net tree
Date: Fri, 04 Dec 2009 07:16:35 -0500 [thread overview]
Message-ID: <4B18FDA3.5060601@gmail.com> (raw)
In-Reply-To: <20091204194301.ca77fe40.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Eric,
>
> Today's linux-next merge of the sysctl tree got a conflict in
> net/ipv4/sysctl_net_ipv4.c between commit
> 519855c508b9a17878c0977a3cdefc09b59b30df ("TCPCT part 1c:
> sysctl_tcp_cookie_size, socket option TCP_COOKIE_TRANSACTIONS") 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.
Hi, I'm not Eric, but it's my TCPCT patch -- is there something more
that I need to do?
Adding a sysctl was my very first query to Linux lists. I thought
everything was covered in that and subsequent threads.
Subject: query: adding a sysctl
Date: Fri, 02 Oct 2009 00:00:05 -0400
next prev parent reply other threads:[~2009-12-04 12:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-04 8:43 linux-next: manual merge of the sysctl tree with the net tree Stephen Rothwell
2009-12-04 12:16 ` William Allen Simpson [this message]
2009-12-04 12:21 ` Stephen Rothwell
2009-12-04 21:42 ` Eric W. Biederman
-- strict thread matches above, loose matches on Subject: below --
2009-12-04 8:36 Stephen Rothwell
2009-12-04 8:50 ` 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=4B18FDA3.5060601@gmail.com \
--to=william.allen.simpson@gmail.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).