From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Patrick McHardy <kaber@trash.net>,
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 00:50:04 -0800 [thread overview]
Message-ID: <m1ocmfdsxv.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <20091204193613.8986a3c6.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Fri\, 4 Dec 2009 19\:36\:13 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Eric,
>
> Today's linux-next merge of the sysctl tree got a conflict in
> kernel/sysctl_check.c between commit
> 8153a10c08f1312af563bb92532002e46d3f504a ("ipv4: add sysctl to accept
> packets with local source addresses") from the net tree and commit
> 83ac201b4f06eb8aeb7ac93cf162651ba30e0b28 ("sysctl: Remove dead code from
> sysctl_check") from the sysctl tree.
>
> The latter removes the need for the former to change this file. I just
> used the latter.
Rats. I feel blind. I totally missed the fact that sysctl_check was
changed in that one.
Eric
next prev parent reply other threads:[~2009-12-04 8:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-04 8:36 linux-next: manual merge of the sysctl tree with the net tree Stephen Rothwell
2009-12-04 8:50 ` Eric W. Biederman [this message]
-- 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
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=m1ocmfdsxv.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--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).