drop a 4.17 tools patch

diff --git a/queue-4.17/series b/queue-4.17/series
index d79dcc7631dd64c7f8b26ce29dcf09a8e5f638c7..4a839377458d6ca5968fab910b92cc98cda97840 100644 (file)
--- a/queue-4.17/series
+++ b/queue-4.17/series
@@ -114,7 +114,6 @@ perf-record-support-s390-random-socket_id-assignment.patch
 perf-test-session-topology-fix-test-on-s390.patch
 perf-report-powerpc-fix-crash-if-callchain-is-empty.patch
 perf-tests-add-event-parsing-error-handling-to-parse-events-test.patch
-tools-include-uapi-update-if_link.h-to-pick-ifla_-brport_isolated-vxlan_ttl_inherit.patch
 perf-tools-fix-a-clang-7.0-compilation-error.patch
 perf-bench-fix-numa-report-output-code.patch
 perf-script-fix-crash-because-of-missing-evsel-priv.patch

diff --git a/queue-4.17/tools-include-uapi-update-if_link.h-to-pick-ifla_-brport_isolated-vxlan_ttl_inherit.patch b/queue-4.17/tools-include-uapi-update-if_link.h-to-pick-ifla_-brport_isolated-vxlan_ttl_inherit.patch
deleted file mode 100644 (file)
index 6de40ee..0000000
--- a/queue-4.17/tools-include-uapi-update-if_link.h-to-pick-ifla_-brport_isolated-vxlan_ttl_inherit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From foo@baz Wed Aug 22 09:16:56 CEST 2018
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-Date: Fri, 15 Jun 2018 16:46:57 -0300
-Subject: tools include uapi: Update if_link.h to pick IFLA_{BRPORT_ISOLATED,VXLAN_TTL_INHERIT}
-
-From: Arnaldo Carvalho de Melo <acme@redhat.com>
-
-[ Upstream commit bb9a33cb8a807e5ae9906563f5c1533904651b8b ]
-
-The IFLA_BRPORT_ISOLATED and IFLA_VXLAN_TTL_INHERIT defines were added in:
-
-  7d850abd5f4e ("net: bridge: add support for port isolation")
-  72f6d71e491e ("vxlan: add ttl inherit support")
-
-Pick them, silencing this build warning:
-
-  Warning: Kernel ABI header at 'tools/include/uapi/linux/if_link.h' differs from latest version at 'include/uapi/linux/if_link.h'
-
-Cc: Alexei Starovoitov <ast@kernel.org>
-Cc: David S. Miller <davem@davemloft.net>
-Cc: Eric Leblond <eric@regit.org>
-Cc: Hangbin Liu <liuhangbin@gmail.com>
-Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-Link: https://lkml.kernel.org/n/tip-ezi5u0mmdqm0wfm0y2y8176r@git.kernel.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- tools/include/uapi/linux/if_link.h |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/tools/include/uapi/linux/if_link.h
-+++ b/tools/include/uapi/linux/if_link.h
-@@ -333,6 +333,7 @@ enum {
-       IFLA_BRPORT_BCAST_FLOOD,
-       IFLA_BRPORT_GROUP_FWD_MASK,
-       IFLA_BRPORT_NEIGH_SUPPRESS,
-+      IFLA_BRPORT_ISOLATED,
-       __IFLA_BRPORT_MAX
- };
- #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
-@@ -516,6 +517,7 @@ enum {
-       IFLA_VXLAN_COLLECT_METADATA,
-       IFLA_VXLAN_LABEL,
-       IFLA_VXLAN_GPE,
-+      IFLA_VXLAN_TTL_INHERIT,
-       __IFLA_VXLAN_MAX
- };
- #define IFLA_VXLAN_MAX        (__IFLA_VXLAN_MAX - 1)