From 0bdda8a2644b5fa7aed79e36ced7d95cc7e5b1da Mon Sep 17 00:00:00 2001
From: "Mauro (mdrjr) Ribeiro" <mauro.ribeiro@hardkernel.com>
Date: Thu, 29 Aug 2019 18:32:34 -0300
Subject: [PATCH] net/ipv6: fix a merge conflict

Change-Id: I05840f8be0301d073965e4e8c6c12c5bf9c2c5ad
---
 net/ipv6/ip6_tunnel.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index dc2363e5183e..21c295517318 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1362,11 +1362,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
 			fl6.flowi6_mark = skb->mark;
 	}
 
-<<<<<<< HEAD
 	fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
-=======
-	dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));
->>>>>>> 5c6502c4a18b17712f530e6702ffed0c3dff75af
 
 	if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
 		return -1;