From: David Miller <davem@davemloft.net>
To: steffen.klassert@secunet.com
Cc: herbert@gondor.apana.org.au, netdev@vger.kernel.org
Subject: Re: pull request (net-next): ipsec-next 2014-01-14
Date: Mon, 13 Jan 2014 23:14:57 -0800 (PST) [thread overview]
Message-ID: <20140113.231457.1269719541362689128.davem@davemloft.net> (raw)
In-Reply-To: <1389682159-3260-1-git-send-email-steffen.klassert@secunet.com>
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Tue, 14 Jan 2014 07:49:04 +0100
> This pull request has a merge conflict between commits be7928d20bab
> ("net: xfrm: xfrm_policy: fix inline not at beginning of declaration") and
> da7c224b1baa ("net: xfrm: xfrm_policy: silence compiler warning") from
> the net-next tree and commit 2f3ea9a95c58 ("xfrm: checkpatch erros with
> inline keyword position") from the ipsec-next tree.
>
> The version from net-next can be used, like it is done in linux-next.
>
> 1) Checkpatch cleanups, from Weilong Chen.
>
> 2) Fix lockdep complaints when pktgen is used with IPsec,
> from Fan Du.
>
> 3) Update pktgen to allow any combination of IPsec transport/tunnel mode
> and AH/ESP/IPcomp type, from Fan Du.
>
> 4) Make pktgen_dst_metrics static, Fengguang Wu.
>
> 5) Compile fix for pktgen when CONFIG_XFRM is not set,
> from Fan Du.
>
> Please pull or let me know if there are problems.
Pulled, thanks for the heads up about the merge conflicts.
prev parent reply other threads:[~2014-01-14 7:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 6:49 pull request (net-next): ipsec-next 2014-01-14 Steffen Klassert
2014-01-14 6:49 ` [PATCH 01/15] xfrm: checkpatch errors with space Steffen Klassert
2014-01-14 6:49 ` [PATCH 02/15] xfrm: checkpatch errors with foo * bar Steffen Klassert
2014-01-14 6:49 ` [PATCH 03/15] xfrm: checkpatch erros with space prohibited Steffen Klassert
2014-01-14 6:49 ` [PATCH 04/15] xfrm: fix checkpatch error Steffen Klassert
2014-01-14 6:49 ` [PATCH 05/15] xfrm: checkpatch erros with inline keyword position Steffen Klassert
2014-01-14 6:49 ` [PATCH 06/15] {pktgen, xfrm} Correct xfrm state lock usage when transforming Steffen Klassert
2014-01-14 6:49 ` [PATCH 07/15] {pktgen, xfrm} Add statistics counting " Steffen Klassert
2014-01-14 6:49 ` [PATCH 08/15] {pktgen, xfrm} Correct xfrm_state_lock usage in xfrm_stateonly_find Steffen Klassert
2014-01-14 6:49 ` [PATCH 09/15] {pktgen, xfrm} Using "pgset spi xxx" to spedifiy SA for a given flow Steffen Klassert
2014-01-14 6:49 ` [PATCH 10/15] {pktgen, xfrm} Construct skb dst for tunnel mode transformation Steffen Klassert
2014-01-14 6:49 ` [PATCH 11/15] {pktgen, xfrm} Introduce xfrm_state_lookup_byspi for pktgen Steffen Klassert
2014-01-14 6:49 ` [PATCH 12/15] {pktgen, xfrm} Show spi value properly when ipsec turned on Steffen Klassert
2014-01-14 6:49 ` [PATCH 13/15] {pktgen, xfrm} Document IPsec usage in pktgen.txt Steffen Klassert
2014-01-14 6:49 ` [PATCH 14/15] pktgen_dst_metrics[] can be static Steffen Klassert
2014-01-14 6:49 ` [PATCH 15/15] {xfrm,pktgen} Fix compiling error when CONFIG_XFRM is not set Steffen Klassert
2014-01-14 7:14 ` David Miller [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=20140113.231457.1269719541362689128.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/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).