Drop patch with mistaken commit message

I screwed up my scripts and ended up mixing two patches.

Fix it up by removing the faulty commit, it's not stable material.

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.2/net-ipv4-fib_trie-avoid-cryptic-ternary-expressions.patch b/queue-5.2/net-ipv4-fib_trie-avoid-cryptic-ternary-expressions.patch
deleted file mode 100644 (file)
index 6649015..0000000
--- a/queue-5.2/net-ipv4-fib_trie-avoid-cryptic-ternary-expressions.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9c2fa1ab4055d3c560c09a01f270e66adafe54fa Mon Sep 17 00:00:00 2001
-From: Nathan Huckleberry <nhuck@google.com>
-Date: Mon, 17 Jun 2019 10:28:29 -0700
-Subject: net/ipv4: fib_trie: Avoid cryptic ternary expressions
-
-[ Upstream commit 25cec756891e8733433efea63b2254ddc93aa5cc ]
-
-empty_child_inc/dec() use the ternary operator for conditional
-operations. The conditions involve the post/pre in/decrement
-operator and the operation is only performed when the condition
-is *not* true. This is hard to parse for humans, use a regular
-'if' construct instead and perform the in/decrement separately.
-
-This also fixes two warnings that are emitted about the value
-of the ternary expression being unused, when building the kernel
-with clang + "kbuild: Remove unnecessary -Wno-unused-value"
-(https://lore.kernel.org/patchwork/patch/1089869/):
-
-CC      net/ipv4/fib_trie.o
-net/ipv4/fib_trie.c:351:2: error: expression result unused [-Werror,-Wunused-value]
-        ++tn_info(n)->empty_children ? : ++tn_info(n)->full_children;
-
-Fixes: 95f60ea3e99a ("fib_trie: Add collapse() and should_collapse() to resize")
-Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
-Reviewed-by: Douglas Anderson <dianders@chromium.org>
-Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
-Acked-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- scripts/Makefile.extrawarn | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
-index 3ab8d1a303cd..b293246e48fe 100644
---- a/scripts/Makefile.extrawarn
-+++ b/scripts/Makefile.extrawarn
-@@ -68,7 +68,6 @@ else
- 
- ifdef CONFIG_CC_IS_CLANG
- KBUILD_CFLAGS += -Wno-initializer-overrides
--KBUILD_CFLAGS += -Wno-unused-value
- KBUILD_CFLAGS += -Wno-format
- KBUILD_CFLAGS += -Wno-sign-compare
- KBUILD_CFLAGS += -Wno-format-zero-length
--- 
-2.20.1
-

diff --git a/queue-5.2/series b/queue-5.2/series
index d491ba35635e1723c550e971603dcccea2c0024f..f1a2151728ec6bf19216ae530b1a952726bb91ad 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -80,7 +80,6 @@ serial-mctrl_gpio-check-if-gpio-property-exisits-bef.patch
 phy-renesas-rcar-gen3-usb2-fix-imbalance-powered-fla.patch
 pci-sysfs-ignore-lockdep-for-remove-attribute.patch
 i2c-stm32f7-fix-the-get_irq-error-cases.patch
-net-ipv4-fib_trie-avoid-cryptic-ternary-expressions.patch
 kbuild-add-werror-unknown-warning-option-to-clang_fl.patch
 genksyms-teach-parser-about-128-bit-built-in-types.patch
 phy-meson-g12a-usb3-pcie-disable-locking-for-cr_regm.patch