netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick McHardy <kaber@trash.net>
To: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: netfilter-devel@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH 0/5] netfilter: ipset patches
Date: Tue, 19 Apr 2011 16:08:09 +0200	[thread overview]
Message-ID: <4DAD9749.7070302@trash.net> (raw)
In-Reply-To: <alpine.DEB.2.00.1104182107170.9202@blackhole.kfki.hu>

Am 18.04.2011 21:08, schrieb Jozsef Kadlecsik:
> On Mon, 18 Apr 2011, Patrick McHardy wrote:
> 
>> Am 13.04.2011 21:52, schrieb Jozsef Kadlecsik:
>>> Hi Patrick,
>>>
>>> Here follows the ipset patches for nf-next-2.6. This batch contains
>>> the missing fixes compared to nf-2.6 and one new feature, the ability
>>> to modify the timeout value of already existing elements.
>>
>> Thanks, but we shouldn't be applying the same patches twice, its better
>> to ask Dave to pull in net-2.6.git into net-next-2.6.git if your
>> patches depend on fixes in that tree, I can then pull net-next-2.6.git
>> into my tree.
> 
> Oh, right. I'm going to send one bugfix today or tomorrow morning, then 
> just the improvements remains.

The fixes are in net-next now, I'll send out the so far queued patches
tonight or tommorrow morning and will then merge the current net-next
tree into nf-next.

      reply	other threads:[~2011-04-19 14:08 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-13 19:52 [PATCH 0/5] netfilter: ipset patches Jozsef Kadlecsik
2011-04-13 19:52 ` [PATCH 1/5] netfilter: ipset: list:set timeout variant fixes Jozsef Kadlecsik
2011-04-13 19:52   ` [PATCH 2/5] netfilter: ipset: references are protected by rwlock instead of mutex Jozsef Kadlecsik
2011-04-13 19:52     ` [PATCH 3/5] netfilter: ipset: Timeout can be modified for already added elements Jozsef Kadlecsik
2011-04-13 19:52       ` [PATCH 4/5] netfilter: ipset: bitmap:ip,mac type requires "src" for MAC Jozsef Kadlecsik
2011-04-13 19:52         ` [PATCH 5/5] netfilter: ipset: set match and SET target fixes Jozsef Kadlecsik
2011-04-18 14:33 ` [PATCH 0/5] netfilter: ipset patches Patrick McHardy
2011-04-18 19:08   ` Jozsef Kadlecsik
2011-04-19 14:08     ` Patrick McHardy [this message]

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=4DAD9749.7070302@trash.net \
    --to=kaber@trash.net \
    --cc=davem@davemloft.net \
    --cc=kadlec@blackhole.kfki.hu \
    --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).