From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: netdev@vger•kernel.org, steffen.klassert@secunet•com,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
xiyou.wangcong@gmail•com
Subject: Re: linux-next: manual merge of the net-next tree with the ipsec tree
Date: Tue, 13 May 2014 00:07:53 -0400 (EDT) [thread overview]
Message-ID: <20140513.000753.538591395030698596.davem@davemloft.net> (raw)
In-Reply-To: <20140513135322.3dfadb7c@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 13 May 2014 13:53:22 +1000
> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv6/xfrm6_output.c between commit 5596732fa8c1 ("xfrm: Fix crash
> with ipv6 IPsec tunnel and NAT") from the ipsec tree and commit
> 60ff746739bf ("net: rename local_df to ignore_df") from the net-next
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks Stephen.
next prev parent reply other threads:[~2014-05-13 4:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-13 3:53 linux-next: manual merge of the net-next tree with the ipsec tree Stephen Rothwell
2014-05-13 4:05 ` Cong Wang
2014-05-13 4:07 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-06 0:24 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=20140513.000753.538591395030698596.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=steffen.klassert@secunet$(echo .)com \
--cc=xiyou.wangcong@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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