From: David Miller <davem@davemloft.net>
To: akpm@linux-foundation.org
Cc: netdev@vger.kernel.org, ebiederm@xmission.com
Subject: Re: sysctls
Date: Wed, 25 Apr 2007 13:00:11 -0700 (PDT) [thread overview]
Message-ID: <20070425.130011.21926881.davem@davemloft.net> (raw)
In-Reply-To: <20070425122924.88391585.akpm@linux-foundation.org>
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 25 Apr 2007 12:29:24 -0700
>
> I note that the networking tree is adding new sysctls:
>
> <<<<<<< HEAD/include/linux/sysctl.h
> NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
> =======
> NET_IPV6_OPTIMISTIC_DAD=24,
> NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
> >>>>>>> /include/linux/sysctl.h
>
> (Well, it's trying to - there are some git rejects in net-2.6.22)
I knew this was going to happen because of Yoshifuji's
security fix, the conflict is trivial to resolve.
I'll rebase the net-2.6.22 tree later today since all
we should have before 2.6.21-final is the netlink
OOPS'er fix Alexey just posted.
next prev parent reply other threads:[~2007-04-25 20:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-25 19:29 sysctls Andrew Morton
2007-04-25 19:45 ` sysctls Eric W. Biederman
2007-04-25 19:53 ` sysctls Neil Horman
2007-04-25 21:50 ` sysctls Andrew Morton
2007-04-25 23:47 ` sysctls David Miller
2007-04-26 11:12 ` sysctls Neil Horman
2007-04-25 20:00 ` David Miller [this message]
2007-04-25 20:06 ` sysctls Eric W. Biederman
2007-04-25 20:10 ` sysctls David Miller
2007-04-25 20:13 ` sysctls 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=20070425.130011.21926881.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.