From: David Miller <davem@davemloft.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH 00/15] Netfilter updates for net-next
Date: Thu, 20 Aug 2015 14:48:44 -0700 (PDT) [thread overview]
Message-ID: <20150820.144844.1054207553671640533.davem@davemloft.net> (raw)
In-Reply-To: <1440011911-4359-1-git-send-email-pablo@netfilter.org>
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 19 Aug 2015 21:18:16 +0200
> The following patchset contains Netfilter updates for your net-next tree, they
> are:
This doesn't pull cleanly, I get a couple of conflicts:
[davem@localhost net-next]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
remote: Counting objects: 195, done.
remote: Compressing objects: 100% (195/195), done.
remote: Total 195 (delta 121), reused 0 (delta 0)
Receiving objects: 100% (195/195), 211.81 KiB | 0 bytes/s, done.
Resolving deltas: 100% (121/121), done.
>From git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
* branch HEAD -> FETCH_HEAD
Auto-merging net/netfilter/xt_CT.c
CONFLICT (content): Merge conflict in net/netfilter/xt_CT.c
Auto-merging net/netfilter/nf_synproxy_core.c
CONFLICT (content): Merge conflict in net/netfilter/nf_synproxy_core.c
Auto-merging net/netfilter/nf_conntrack_core.c
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
Automatic merge failed; fix conflicts and then commit the result.
Please fix this up and resubmit your pull request, thanks!
next prev parent reply other threads:[~2015-08-20 21:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-19 19:18 [PATCH 00/15] Netfilter updates for net-next Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 01/15] netfilter: nft_counter: convert it to use per-cpu counters Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 02/15] netfilter: xt_TEE: get rid of WITH_CONNTRACK definition Pablo Neira Ayuso
2015-08-19 19:18 ` =?y?q?=5BPATCH=2003/15=5D=20netfilter=3A=20factor=20out=20packet=20duplication=20for=20IPv4/IPv6?= Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 04/15] netfilter: nf_tables: add nft_dup expression Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 05/15] netfilter: nft_limit: rename to nft_limit_pkts Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 06/15] netfilter: nft_limit: convert to token-based limiting at nanosecond granularity Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 07/15] netfilter: nft_limit: factor out shared code with per-byte limiting Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 08/15] netfilter: nft_limit: add burst parameter Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 09/15] netfilter: nft_limit: constant token cost per packet Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 10/15] netfilter: nft_limit: add per-byte limiting Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 11/15] netfilter: nfacct: per network namespace support Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 12/15] netfilter: nf_conntrack: push zone object into functions Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 13/15] netfilter: nf_conntrack: add direction support for zones Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 14/15] netfilter: nf_conntrack: add efficient mark to zone mapping Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 15/15] netfilter: nft_payload: work around vlan header stripping Pablo Neira Ayuso
2015-08-20 21:48 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-21 4:32 [PATCH 00/15] Netfilter updates for net-next Pablo Neira Ayuso
2015-08-21 5:19 ` David Miller
2015-03-26 12:06 Pablo Neira Ayuso
2015-03-29 19:48 ` 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=20150820.144844.1054207553671640533.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).