Hi all,

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

  net/ipv4/tcp_output.c

between commit:

  5889e2c0e441d8 ("tcp: call tcp_rate_skb_sent() when retransmit with unaligned skb->data")

from Linus' tree and commit:

  e2080072ed2d98 ("tcp: new list for sent but unacked skbs for RACK recovery")

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/ipv4/tcp_output.c
index ae60dd3faed0,aab6e7145013..000000000000
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -2840,13 -2905,14 +2907,16 @@@ int __tcp_retransmit_skb(struct sock *s
  		     skb_headroom(skb) >= 0xFFFF)) {
  		struct sk_buff *nskb;
  
- 		nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
- 		err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
- 			     -ENOBUFS;
+ 		tcp_skb_tsorted_save(skb) {
+ 			nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
+ 			err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
+ 				     -ENOBUFS;
+ 		} tcp_skb_tsorted_restore(skb);
+ 
 -		if (!err)
 +		if (!err) {
- 			skb->skb_mstamp = tp->tcp_mstamp;
+ 			tcp_update_skb_after_send(tp, skb);
 +			tcp_rate_skb_sent(sk, skb);
 +		}
  	} else {
  		err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
  	}