linux-next: manual merge of the ipsec-next tree with the net-next tree

2020-05-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the ipsec-next tree got a conflict in: net/ipv6/af_inet6.c between commit: 3986912f6a9a ("ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl") from the net-next tree and commit: 0146dca70b87 ("xfrm: add support for UDPv6 encapsulation of

linux-next: manual merge of the ipsec-next tree with the net-next tree

2018-04-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the ipsec-next tree got a conflict in: net/ipv4/ip_output.c between commit: bec1f6f69736 ("udp: generate gso with UDP_SEGMENT") from the net-next tree and commit: cd027a5433d6 ("udp: enable UDP checksum offload for ESP") from the ipsec-next tree. I

linux-next: manual merge of the ipsec-next tree with the net-next tree

2017-02-12 Thread Stephen Rothwell
Hi Steffen, Today's linux-next merge of the ipsec-next tree got a conflict in: net/xfrm/xfrm_policy.c between commit: 63fca65d0863 ("net: add confirm_neigh method to dst_ops") from the net-next tree and commits: 3d7d25a68ea5 ("xfrm: policy: remove garbage_collect callback") a2817d8b27

linux-next: manual merge of the ipsec-next tree with the net-next tree

2014-01-08 Thread Stephen Rothwell
Hi Steffen, Today's linux-next merge of the ipsec-next tree got a conflict in net/xfrm/xfrm_policy.c 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

Re: linux-next: manual merge of the ipsec-next tree with the net-next tree

2013-09-26 Thread Stephen Rothwell
Hi Steffen, On Wed, 25 Sep 2013 07:29:23 +0200 Steffen Klassert wrote: > > On Wed, Sep 25, 2013 at 09:59:19AM +1000, Stephen Rothwell wrote: > > > > On Tue, 24 Sep 2013 12:25:05 +0200 Steffen Klassert > > wrote: > > > > > > On Tue, Sep 24, 2013 at 12:16:29PM +1000, Stephen Rothwell wrote: > >

Re: linux-next: manual merge of the ipsec-next tree with the net-next tree

2013-09-24 Thread Steffen Klassert
On Wed, Sep 25, 2013 at 09:59:19AM +1000, Stephen Rothwell wrote: > Hi Steffen, > > On Tue, 24 Sep 2013 12:25:05 +0200 Steffen Klassert > wrote: > > > > On Tue, Sep 24, 2013 at 12:16:29PM +1000, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the ipsec-next tree got a conflict i

Re: linux-next: manual merge of the ipsec-next tree with the net-next tree

2013-09-24 Thread Stephen Rothwell
Hi Steffen, On Tue, 24 Sep 2013 12:25:05 +0200 Steffen Klassert wrote: > > On Tue, Sep 24, 2013 at 12:16:29PM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the ipsec-next tree got a conflict in > > include/net/xfrm.h between commit d511337a1eda ("xfrm.h: Remove extern > > f

Re: linux-next: manual merge of the ipsec-next tree with the net-next tree

2013-09-24 Thread Steffen Klassert
Hi Stephen. On Tue, Sep 24, 2013 at 12:16:29PM +1000, Stephen Rothwell wrote: > Hi Steffen, > > Today's linux-next merge of the ipsec-next tree got a conflict in > include/net/xfrm.h between commit d511337a1eda ("xfrm.h: Remove extern > from function prototypes") from the net-next tree and commit

linux-next: manual merge of the ipsec-next tree with the net-next tree

2013-09-23 Thread Stephen Rothwell
Hi Steffen, Today's linux-next merge of the ipsec-next tree got a conflict in include/net/xfrm.h between commit d511337a1eda ("xfrm.h: Remove extern from function prototypes") from the net-next tree and commit aba826958830 ("{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback