Messages in this thread | | | Date | Mon, 12 May 2014 21:05:48 -0700 | Subject | Re: linux-next: manual merge of the net-next tree with the ipsec tree | From | Cong Wang <> |
| |
On Mon, May 12, 2014 at 8:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > 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. Thanks!
| |