[MPTCP] [GIT] Sync with net-next on 20190710: 1 conflict

[MPTCP] [GIT] Sync with net-next on 20190710: 1 conflict

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]

Hello,

Just to inform you that we got a conflict when integrating last changes
from net-next:


diff --cc net/core/skbuff.c
index 6f1e31f674a3,710177270ff0..000000000000
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -67,7 -66,7 +67,11 @@@
  #include <net/checksum.h>
  #include <net/ip6_checksum.h>
  #include <net/xfrm.h>
++<<<<<<< t/mptcp-Add-MPTCP-to-skb-extensions base content
 +#include <net/mpls.h>
++=======
+ #include <net/mptcp.h>
++>>>>>>> remotes/origin/t/mptcp-Add-MPTCP-to-skb-extensions

  #include <linux/uaccess.h>
  #include <trace/events/skb.h>


Very easy to fix, it is due to 8822e270d697 (net: core: move push MPLS
functionality from OvS to core helper).

Our new "include" is now after mpls.h, see 3b4c08939994 for more details.

Only one small conflict over so many other changes:

 747 files changed, 30130 insertions(+), 9260 deletions(-)

Tests are still OK!

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

[MPTCP] [GIT] Sync with net-next on 20190710: 1 conflict

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 1895 bytes --]

Hello,

Just to inform you that we got a conflict when integrating last changes
from net-next:


diff --cc include/net/tcp.h

index 2f774f8d2cb7,7385ff0a7484..000000000000

--- a/include/net/tcp.h

+++ b/include/net/tcp.h

@@@ -2112,10 -2112,11 +2112,13 @@@ struct tcp_ulp_ops



        /* initialize ulp */

        int (*init)(struct sock *sk);

 +      /* update ulp */

 +      void (*update)(struct sock *sk, struct proto *p);
        /* cleanup ulp */
        void (*release)(struct sock *sk);
+       /* clone ulp */
+       void (*clone)(const struct request_sock *req, struct sock
*newsk,
+                     const gfp_t priority);

        char            name[TCP_ULP_NAME_MAX];
        struct module   *owner;
@@@ -2125,7 -2126,8 +2128,12 @@@ void tcp_unregister_ulp(struct tcp_ulp_

  int tcp_set_ulp(struct sock *sk, const char *name);
  void tcp_get_available_ulp(char *buf, size_t len);
  void tcp_cleanup_ulp(struct sock *sk);
++<<<<<<< t/tcp-ulp-Add-clone-operation-to-tcp_ulp_ops base content

 +void tcp_update_ulp(struct sock *sk, struct proto *p);
++=======
+ void tcp_clone_ulp(const struct request_sock *req,
+                  struct sock *newsk, const gfp_t priority);
++>>>>>>> remotes/origin/t/tcp-ulp-Add-clone-operation-to-tcp_ulp_ops


  #define MODULE_ALIAS_TCP_ULP(name)                            \

        __MODULE_INFO(alias, alias_userspace, name);            \


Very easy to fix, it is due to 95fa145479fb (bpf: sockmap/tls, close can
race with map free).

Our new "tcp_clone_ulp()" signature is now after tcp_update_ulp(), see
0bdd68fb6fa8 / 25f5f5399b6c for more details.

Tests are still OK!

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