Hello,

With the last sync with net-next, a conflict was found:


diff --cc include/net/sock.h
index fd982f976925,0680fa988497..000000000000
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -1473,8 -1473,7 +1473,12 @@@ static inline void sk_wmem_free_skb(str
        sock_set_flag(sk, SOCK_QUEUE_SHRUNK);
        sk->sk_wmem_queued -= skb->truesize;
        sk_mem_uncharge(sk, skb->truesize);
++<<<<<<< t/tcp-clean-ext-on-tx-recycle
 +      if (!sk->sk_tx_skb_cache) {
 +              skb_ext_clear(skb);
++=======
+       if (!sk->sk_tx_skb_cache && !skb_cloned(skb)) {
++>>>>>>> top-bases/t/tcp-clean-ext-on-tx-recycle
                skb_zcopy_clear(skb, true);
                sk->sk_tx_skb_cache = skb;
                return;


The commit 8b2e02e94442 (tcp: clean ext on tx recycle) from Paolo was
conflicting with a new one from upstream: 858f50174467 (tcp: do not
recycle cloned skbs) from Eric Dumazet.

I simply added the new condition (&& !skb_cloned(skb)). I hope it is
alright: a73376082e4c6e3c9a48fd887f759ab1e4118477

The new sync has just been pushed.

Cheers,
Matt
-- 
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium