netdev - Re: pull request (net-next): ipsec-next 2014-01-14

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20140113.231457.1269719541362689128.davem@davemloft.net>
Date:	Mon, 13 Jan 2014 23:14:57 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	steffen.klassert@...unet.com
Cc:	herbert@...dor.apana.org.au, netdev@...r.kernel.org
Subject: Re: pull request (net-next): ipsec-next 2014-01-14

From: Steffen Klassert <steffen.klassert@...unet.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html