linux-kernel - linux-next: manual merge of the ipsec-next tree with Linus' tree

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>] [day] [month] [year] [list]

Date:	Mon, 2 Sep 2013 13:40:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steffen Klassert <steffen.klassert@...unet.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Fan Du <fan.du@...driver.com>,
	Hannes Frederic Sowa <hannes@...essinduktion.org>
Subject: linux-next: manual merge of the ipsec-next tree with Linus' tree

Hi Steffen,

Today's linux-next merge of the ipsec-next tree got a conflict in
include/net/xfrm.h between commit 628e341f319f ("xfrm: make local error
reporting more robust") from Linus' tree and commit aba826958830
("{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode
callback") from the ipsec-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/net/xfrm.h
index e253bf0,c7afa6e..0000000
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@@ -1499,9 -1501,8 +1505,9 @@@ extern int xfrm4_output(struct sk_buff 
  extern int xfrm4_output_finish(struct sk_buff *skb);
  extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);
  extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family);
- extern int xfrm4_mode_tunnel_input_register(struct xfrm_tunnel *handler);
- extern int xfrm4_mode_tunnel_input_deregister(struct xfrm_tunnel *handler);
+ extern int xfrm4_mode_tunnel_input_register(struct xfrm_tunnel_notifier *handler);
+ extern int xfrm4_mode_tunnel_input_deregister(struct xfrm_tunnel_notifier *handler);
 +extern void xfrm4_local_error(struct sk_buff *skb, u32 mtu);
  extern int xfrm6_extract_header(struct sk_buff *skb);
  extern int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb);
  extern int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi);

Content of type "application/pgp-signature" skipped