From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull request (net): ipsec 2018-03-29
Date: Thu, 29 Mar 2018 10:18:06 -0400 (EDT)
Message-ID: <20180329.101806.752914857685567157.davem@davemloft.net>
References: <20180329071120.27353-1-steffen.klassert@secunet.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: herbert@gondor.apana.org.au, netdev@vger.kernel.org
To: steffen.klassert@secunet.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:43638 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750716AbeC2OSI (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 29 Mar 2018 10:18:08 -0400
In-Reply-To: <20180329071120.27353-1-steffen.klassert@secunet.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 29 Mar 2018 09:11:12 +0200

> 1) Fix a rcu_read_lock/rcu_read_unlock imbalance
>    in the error path of xfrm_local_error().
>    From Taehee Yoo.
> 
> 2) Some VTI MTU fixes. From Stefano Brivio.
> 
> 3) Fix a too early overwritten skb control buffer
>    on xfrm transport mode.
> 
> Please not that this pull request has a merge conflict
> in net/ipv4/ip_tunnel.c.
 ...

Pulled, and thanks for the conflict info.