From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755309AbcECDPa (ORCPT ); Mon, 2 May 2016 23:15:30 -0400 Received: from ozlabs.org ([103.22.144.67]:44327 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755238AbcECDP3 (ORCPT ); Mon, 2 May 2016 23:15:29 -0400 Date: Tue, 3 May 2016 13:15:24 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Benc , Tom Herbert Subject: linux-next: manual merge of the net-next tree with Linus' tree Message-ID: <20160503131524.5341da81@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/ip_gre.c between commits: 2090714e1d6e ("gre: build header correctly for collect metadata tunnels") b7f8fe251e46 ("gre: do not pull header in ICMP error processing") from Linus' tree and commit: 95f5c64c3c13 ("gre: Move utility functions to common headers") 182a352d2d5e ("gre: Create common functions for transmit") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/ipv4/ip_gre.c index 205a2b8a5a84,2480d79b0e37..000000000000 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@@ -341,8 -221,9 +221,9 @@@ static void gre_err(struct sk_buff *skb const int code = icmp_hdr(skb)->code; struct tnl_ptk_info tpi; bool csum_err = false; + int hdr_len; - if (parse_gre_header(skb, &tpi, &csum_err) < 0) { - if (gre_parse_header(skb, &tpi, &csum_err, &hdr_len)) { ++ if (gre_parse_header(skb, &tpi, &csum_err, &hdr_len) < 0) { if (!csum_err) /* ignore csum errors. */ return; } @@@ -574,15 -414,12 +415,12 @@@ static void gre_fb_xmit(struct sk_buff } /* Push Tunnel header. */ - skb = gre_handle_offloads(skb, !!(tun_info->key.tun_flags & TUNNEL_CSUM)); - if (IS_ERR(skb)) { - skb = NULL; + if (gre_handle_offloads(skb, !!(tun_info->key.tun_flags & TUNNEL_CSUM))) goto err_free_rt; - } flags = tun_info->key.tun_flags & (TUNNEL_CSUM | TUNNEL_KEY); - build_header(skb, tunnel_hlen, flags, proto, - tunnel_id_to_key(tun_info->key.tun_id), 0); - gre_build_header(skb, tunnel_hlen, flags, htons(ETH_P_TEB), ++ gre_build_header(skb, tunnel_hlen, flags, proto, + tunnel_id_to_key(tun_info->key.tun_id), 0); df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;