From: Patrick McHardy <kaber@trash•net>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org, netfilter-devel@vger•kernel.org
Subject: Re: netfilter 00/05: netfilter fixes
Date: Mon, 09 Feb 2009 23:47:07 +0100 [thread overview]
Message-ID: <4990B26B.3020705@trash.net> (raw)
In-Reply-To: <20090209.143238.25276576.davem@davemloft.net>
David Miller wrote:
> From: Patrick McHardy <kaber@trash•net>
> Date: Mon, 9 Feb 2009 17:39:27 +0100 (MET)
>
>> Please apply or pull from:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
>
> I was going to pull from your tree and take it like that, but when I
> pulled I got 5 real changes and 50 merges with net-2.6, yikes! :-)
Ugh sorry, thats happening automatically, but it usually doesn't show
up since it should be fast forwards. I'll have a look at what went
wrong.
> If there was one or two merge changesets in there, I would have
> taken it. But anything more than that for a tree containing
> 5 bug fixes is excessive.
>
> I'll apply these as patches, but I really do want to be able to
> pull from your trees so please try to provide a cleaner tree
> next time.
I'll make sure of it, sorry.
next prev parent reply other threads:[~2009-02-09 22:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-09 16:39 netfilter 00/05: netfilter fixes Patrick McHardy
2009-02-09 16:39 ` netfilter 01/05: fix tuple inversion for Node information request Patrick McHardy
2009-02-09 16:39 ` netfilter 02/05: nf_conntrack_ipv6: don't track ICMPv6 negotiation message Patrick McHardy
2009-02-09 16:39 ` netfilter 03/05: ctnetlink: allow changing NAT sequence adjustment in creation Patrick McHardy
2009-02-09 16:39 ` netfilter 04/05: ctnetlink: fix echo if not subscribed to any multicast group Patrick McHardy
2009-02-09 16:39 ` netfilter 05/05: xt_sctp: sctp chunk mapping doesn't work Patrick McHardy
2009-02-09 22:32 ` netfilter 00/05: netfilter fixes David Miller
2009-02-09 22:47 ` Patrick McHardy [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2009-04-24 15:44 Patrick McHardy
2009-04-26 0:57 ` David Miller
2009-05-05 12:33 ` Patrick McHardy
2009-12-15 16:14 Patrick McHardy
2009-12-16 5:12 ` David Miller
2010-02-08 17:10 Patrick McHardy
2010-02-08 19:15 ` David Miller
2010-02-09 17:33 ` Patrick McHardy
2010-02-09 18:19 ` Jan Engelhardt
2010-02-10 13:52 ` Patrick McHardy
2010-02-09 20:38 ` David Miller
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=4990B26B.3020705@trash.net \
--to=kaber@trash$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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