Messages in this thread | | | Date | Wed, 25 Sep 2013 09:59:19 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the ipsec-next tree with the net-next tree |
| |
Hi Steffen,
On Tue, 24 Sep 2013 12:25:05 +0200 Steffen Klassert <steffen.klassert@secunet.com> 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 > > 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.
Did you miss the end of the next paragraph: "no action is required"? Dave can fix this up (like I did) when he merges your tree into his.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |