Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/core/dev.c

between commit:

  fdca4b030c78f ("net: Segment CHECKSUM_UNNECESSARY GSO skbs other than fraglist")

from the net tree and commit:

  f4564d298418c ("net: reset transport_header for ndo_features_check")

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.

diff --cc net/core/dev.c
index 3c58db732761a,3eb28c0099605..0000000000000
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -4207,18 -4215,15 +4215,27 @@@ static struct sk_buff *validate_xmit_sk
  	if (unlikely(!skb))
  		goto out_null;
  
 +	/* Only fraglist GSO, whose segments already carry valid checksums,
 +	 * can be handed to a device as CHECKSUM_UNNECESSARY. Any other GSO
 +	 * skb has no csum_start for the device to segment from. NONE means
 +	 * the same on transmit, but makes netif_needs_gso() send it to the
 +	 * GSO code, which turns TCP into CHECKSUM_PARTIAL for TSO and
 +	 * segments anything the device cannot offload in software.
 +	 */
 +	if (unlikely(skb->ip_summed == CHECKSUM_UNNECESSARY &&
 +		     skb_is_gso(skb) &&
 +		     !(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST)))
 +		skb->ip_summed = CHECKSUM_NONE;
 +
+ 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ 		if (skb->encapsulation)
+ 			skb_set_inner_transport_header(skb,
+ 						       skb_checksum_start_offset(skb));
+ 		else
+ 			skb_set_transport_header(skb,
+ 						 skb_checksum_start_offset(skb));
+ 	}
+ 
  	features = netif_skb_features(skb);
  	skb = validate_xmit_vlan(skb, features);
  	if (unlikely(!skb))