linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steffen Klassert <steffen.klassert@secunet.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Fan Du <fan.du@windriver.com>,
	Hannes Frederic Sowa <hannes@stressinduktion.org>
Subject: linux-next: manual merge of the ipsec-next tree with Linus' tree
Date: Mon, 2 Sep 2013 13:40:36 +1000	[thread overview]
Message-ID: <20130902134036.94e1a4c9d6b2453dd99d4100@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1520 bytes --]

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@canb.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);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-09-02  3:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-02  3:40 Stephen Rothwell [this message]
2020-05-11  3:00 linux-next: manual merge of the ipsec-next tree with Linus' tree Stephen Rothwell
2020-06-01 23:20 ` Stephen Rothwell
2020-06-02  2:30   ` David Ahern
2020-06-04  1:26     ` Stephen Rothwell
2020-06-04  2:55       ` David Ahern
2020-06-04  6:41         ` Steffen Klassert
2020-06-04 12:44           ` David Ahern
2020-06-05  9:18             ` Steffen Klassert
2020-06-16 13:39             ` David Ahern
2020-06-16 16:23               ` Steffen Klassert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130902134036.94e1a4c9d6b2453dd99d4100@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=fan.du@windriver.com \
    --cc=hannes@stressinduktion.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=steffen.klassert@secunet.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).