From: Patrick McHardy <kaber@trash.net>
To: Jan Engelhardt <jengelh@medozas.de>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: Re: netfilter 00/05: netfilter fixes
Date: Wed, 10 Feb 2010 14:52:09 +0100 [thread overview]
Message-ID: <4B72BA09.8000602@trash.net> (raw)
In-Reply-To: <alpine.LSU.2.01.1002091918310.10859@obet.zrqbmnf.qr>
Jan Engelhardt wrote:
> On Tuesday 2010-02-09 18:33, Patrick McHardy wrote:
>
>> Thanks Dave. I plan to submit a first batch of patches queued for
>> net-next-2.6 soon, however these fixes introduced a large number
>> of conflicts. If you could merge net-2.6 into net-next-2.6 I'll
>> resolve them and send a pull request.
>
> Ah that is a good opportunity then to rebase my pending -next patches,
> to reduce conflicts you would have to solve when merging things after
> the conflict resolution.
I've merged the current net-next tree and pushed it out.
next prev parent reply other threads:[~2010-02-10 13:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-08 17:10 netfilter 00/05: netfilter fixes Patrick McHardy
2010-02-08 17:10 ` netfilter 01/05: nf_conntrack: fix memory corruption with multiple namespaces Patrick McHardy
2010-02-08 17:10 ` netfilter 02/05: nf_conntrack: per netns nf_conntrack_cachep Patrick McHardy
2010-02-08 17:10 ` netfilter 03/05: nf_conntrack: restrict runtime expect hashsize modifications Patrick McHardy
2010-02-08 17:10 ` netfilter 04/05: xtables: compat out of scope fix Patrick McHardy
2010-02-08 17:10 ` netfilter 05/05: nf_conntrack: fix hash resizing with namespaces Patrick McHardy
2010-02-08 19:15 ` netfilter 00/05: netfilter fixes David Miller
2010-02-09 17:33 ` Patrick McHardy
2010-02-09 18:19 ` Jan Engelhardt
2010-02-10 13:52 ` Patrick McHardy [this message]
2010-02-09 20:38 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-12-15 16:14 Patrick McHardy
2009-12-16 5:12 ` David Miller
2009-04-24 15:44 Patrick McHardy
2009-04-26 0:57 ` David Miller
2009-05-05 12:33 ` Patrick McHardy
2009-02-09 16:39 Patrick McHardy
2009-02-09 22:32 ` David Miller
2009-02-09 22:47 ` Patrick McHardy
2009-02-09 23:18 ` David Miller
2009-02-09 23:36 ` Patrick McHardy
2009-02-10 0:28 ` David Miller
2009-02-10 0:31 ` Patrick McHardy
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=4B72BA09.8000602@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=jengelh@medozas.de \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@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 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).