From: Matthieu Baerts <matthieu.baerts at tessares.net>
To: mptcp at lists.01.org
Subject: [MPTCP] [GIT] Sync with net-next on 20190710: 1 conflict
Date: Wed, 10 Jul 2019 16:28:27 +0200 [thread overview]
Message-ID: <5d60bf71-0ce9-6e27-7a30-efeea6b7f50e@tessares.net> (raw)
[-- 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
next reply other threads:[~2019-07-10 14:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-10 14:28 Matthieu Baerts [this message]
2019-08-08 15:57 [MPTCP] [GIT] Sync with net-next on 20190710: 1 conflict Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d60bf71-0ce9-6e27-7a30-efeea6b7f50e@tessares.net \
--to=unknown@example.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.