From: Steffen Klassert <steffen.klassert@secunet.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Fan Du <fan.du@windriver.com>, Joe Perches <joe@perches.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the ipsec-next tree with the net-next tree
Date: Tue, 24 Sep 2013 12:25:05 +0200 [thread overview]
Message-ID: <20130924102505.GS7660@secunet.com> (raw)
In-Reply-To: <20130924121629.f818475ddf308b0494cfce2a@canb.auug.org.au>
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 aba826958830
> ("{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode
> callback") from the ipsec-next tree.
>
Thanks for the information, I'll do a rebase of the ipsec-next
tree tomorrow.
next prev parent reply other threads:[~2013-09-24 10:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 2:16 linux-next: manual merge of the ipsec-next tree with the net-next tree Stephen Rothwell
2013-09-24 2:16 ` Stephen Rothwell
2013-09-24 10:25 ` Steffen Klassert [this message]
2013-09-24 23:59 ` Stephen Rothwell
2013-09-25 5:29 ` Steffen Klassert
2013-09-27 2:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-01-09 2:41 Stephen Rothwell
2014-01-09 2:41 ` Stephen Rothwell
2017-02-12 23:25 Stephen Rothwell
2018-04-30 0:35 Stephen Rothwell
2019-12-15 23:38 Stephen Rothwell
2020-05-19 3:27 Stephen Rothwell
2022-09-08 1:59 Stephen Rothwell
2025-04-22 4:43 Stephen Rothwell
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=20130924102505.GS7660@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=fan.du@windriver.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.