Fix up script error in the 5.3 queue

diff --git a/queue-5.3/drm-i915-perf-fix-icl-perf-register-offsets.patch b/queue-5.3/drm-i915-perf-fix-icl-perf-register-offsets.patch
deleted file mode 100644 (file)
index fb6ce56..0000000
--- a/queue-5.3/drm-i915-perf-fix-icl-perf-register-offsets.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 42fea671d859839839735f363192d60c29fb0fc9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Jul 2019 12:28:41 +0300
-Subject: drm/i915/perf: fix ICL perf register offsets
-
-From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-
-[ Upstream commit 8dcfdfb4501012a8d36d2157dc73925715f2befb ]
-
-We got the wrong offsets (could they have changed?). New values were
-computed off an error state by looking up the register offset in the
-context image as written by the HW.
-
-Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
-Fixes: 1de401c08fa805 ("drm/i915/perf: enable perf support on ICL")
-Acked-by: Kenneth Graunke <kenneth@whitecape.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20190610081914.25428-1-lionel.g.landwerlin@intel.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/bridge/br_vlan.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
-index f5b2aeebbfe98..339236f75a2a0 100644
---- a/net/bridge/br_vlan.c
-+++ b/net/bridge/br_vlan.c
-@@ -715,6 +715,11 @@ void br_vlan_flush(struct net_bridge *br)
- 
-       ASSERT_RTNL();
- 
-+      /* delete auto-added default pvid local fdb before flushing vlans
-+       * otherwise it will be leaked on bridge device init failure
-+       */
-+      br_fdb_delete_by_port(br, NULL, 0, 1);
-+
-       vg = br_vlan_group(br);
-       __vlan_flush(vg);
-       RCU_INIT_POINTER(br->vlgrp, NULL);
--- 
-2.20.1
-

diff --git a/queue-5.3/series b/queue-5.3/series
index 31496556172538f6c96b7be64c599e010efdeb0b..02b342d966f9e0e142d22d4907f752a29b21d7f9 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -248,7 +248,6 @@ rdma-fix-double-free-in-srq-creation-error-flow.patch
 randstruct-check-member-structs-in-is_pure_ops_struct.patch
 arm-dts-am3517-evm-fix-missing-video.patch
 rcu-tree-fix-sched_fifo-params.patch
-drm-i915-perf-fix-icl-perf-register-offsets.patch
 alsa-hda-realtek-pci-quirk-for-medion-e4254.patch
 blk-mq-add-callback-of-.cleanup_rq.patch
 scsi-implement-.cleanup_rq-callback.patch