netdev - Re: pull request (net-next): ipsec-next 2013-11-01

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: <20131102.021442.1241129501223123137.davem@davemloft.net>
Date:	Sat, 02 Nov 2013 02:14:42 -0400 (EDT)
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 2013-11-01

From: Steffen Klassert <steffen.klassert@...unet.com>
Date: Fri,  1 Nov 2013 08:50:53 +0100

> This pull request has a trivial merge conflict between git commit
> e7d8f6c ("xfrm: Add refcount handling to queued policies") and
> git commit 4d53eff ("xfrm: Don't queue retransmitted packets if
> the original is still on the host"). It can be solved as it is
> currently done in linux-next.
> 
> 1) Use vmalloc_node for ipcomp percpu scratches to get proper
>    NUMA affinity, from Eric Dumazet
> 
> 2) Avoid to retransmit packets if the original packet is
>    still in the xfrm hold queue.
> 
> 3) Remove unused padlen field from struct esp_data.
>    From Mathias Krause.
> 
> 4) Remove struct esp_data because now it consists of a single
>    pointer. From Mathias Krause.
> 
> Please pull or let me know if there are problems.

Pulled, thanks a lot.
--
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