Removed redundant patch, patch clean-up6.6-66

Removed:
2005_netfilter-xtables-fix-typo.patch

Minor fixes:
2950_libsubcmd-silence-compiler-warning.patch

Signed-off-by: Mike Pagano <mpagano@gentoo.org>

3 files changed, 8 insertions, 91 deletions

diff --git a/0000_README b/0000_README
index d1178507..590cb13c 100644
--- a/0000_README
+++ b/0000_README
@@ -295,10 +295,6 @@ Patch:  2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
 From:   https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw
 Desc:   Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
 
-Patch:  2005_netfilter-xtables-fix-typo.patch
-From:   https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/net/netfilter?id=306ed1728e8438caed30332e1ab46b28c25fe3d8
-Desc:   netfilter: xtables: fix typo causing some targets not to load on IPv6
-
 Patch:  2010_netfilter-nf-tables-bail-if-stateful-expr-provides-no-clone.patch
 From:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 Desc:   netfilter: nf_tables: bail out if stateful expression provides no .clone
diff --git a/2005_netfilter-xtables-fix-typo.patch b/2005_netfilter-xtables-fix-typo.patch
deleted file mode 100644
index 6a7dfc7c..00000000
--- a/2005_netfilter-xtables-fix-typo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 306ed1728e8438caed30332e1ab46b28c25fe3d8 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sun, 20 Oct 2024 14:49:51 +0200
-Subject: netfilter: xtables: fix typo causing some targets not to load on IPv6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- There is no NFPROTO_IPV6 family for mark and NFLOG.
-- TRACE is also missing module autoload with NFPROTO_IPV6.
-
-This results in ip6tables failing to restore a ruleset. This issue has been
-reported by several users providing incomplete patches.
-
-Very similar to Ilya Katsnelson's patch including a missing chunk in the
-TRACE extension.
-
-Fixes: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed")
-Reported-by: Ignat Korchagin <ignat@cloudflare.com>
-Reported-by: Ilya Katsnelson <me@0upti.me>
-Reported-by: Krzysztof Olędzki <ole@ans.pl>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/xt_NFLOG.c | 2 +-
- net/netfilter/xt_TRACE.c | 1 +
- net/netfilter/xt_mark.c  | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-(limited to 'net/netfilter')
-
-diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
-index d80abd6ccaf8f7..6dcf4bc7e30b2a 100644
---- a/net/netfilter/xt_NFLOG.c
-+++ b/net/netfilter/xt_NFLOG.c
-@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
- 	{
- 		.name       = "NFLOG",
- 		.revision   = 0,
--		.family     = NFPROTO_IPV4,
-+		.family     = NFPROTO_IPV6,
- 		.checkentry = nflog_tg_check,
- 		.destroy    = nflog_tg_destroy,
- 		.target     = nflog_tg,
-diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
-index f3fa4f11348cd8..a642ff09fc8e8c 100644
---- a/net/netfilter/xt_TRACE.c
-+++ b/net/netfilter/xt_TRACE.c
-@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = {
- 		.target		= trace_tg,
- 		.checkentry	= trace_tg_check,
- 		.destroy	= trace_tg_destroy,
-+		.me		= THIS_MODULE,
- 	},
- #endif
- };
-diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
-index f76fe04fc9a4e1..65b965ca40ea7e 100644
---- a/net/netfilter/xt_mark.c
-+++ b/net/netfilter/xt_mark.c
-@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
- 	{
- 		.name           = "MARK",
- 		.revision       = 2,
--		.family         = NFPROTO_IPV4,
-+		.family         = NFPROTO_IPV6,
- 		.target         = mark_tg,
- 		.targetsize     = sizeof(struct xt_mark_tginfo2),
- 		.me             = THIS_MODULE,
--- 
-cgit 1.2.3-korg
-
diff --git a/2950_libsubcmd-silence-compiler-warning.patch b/2950_libsubcmd-silence-compiler-warning.patch
index 7dbe59b0..efc9d854 100644
--- a/2950_libsubcmd-silence-compiler-warning.patch
+++ b/2950_libsubcmd-silence-compiler-warning.patch
@@ -33,22 +33,14 @@ Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 Acked-by: Jiri Olsa <jolsa@kernel.org>
 Link: https://lore.kernel.org/bpf/20241022172329.3871958-4-ezulian@redhat.com
 ---
- tools/lib/subcmd/parse-options.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c
-index eb896d30545b63..555d617c1f502a 100644
---- a/tools/lib/subcmd/parse-options.c
-+++ b/tools/lib/subcmd/parse-options.c
-@@ -807,7 +807,7 @@ static int option__cmp(const void *va, const void *vb)
+--- a/tools/lib/subcmd/parse-options.c	2024-11-01 07:47:50.842865849 -0400
++++ b/tools/lib/subcmd/parse-options.c	2024-11-01 07:48:28.656516527 -0400
+@@ -807,7 +807,7 @@ static int option__cmp(const void *va, c
  static struct option *options__order(const struct option *opts)
  {
- 	int nr_opts = 0, nr_group = 0, nr_parent = 0, len;
--	const struct option *o, *p = opts;
-+	const struct option *o = NULL, *p = opts;
- 	struct option *opt, *ordered = NULL, *group;
+ 	int nr_opts = 0, nr_group = 0, len;
+-	const struct option *o = opts;
++  const struct option *o = NULL, *p = opts;
+ 	struct option *opt, *ordered, *group;
  
- 	/* flatten the options that have parents */
--- 
-cgit 1.2.3-korg
-
+ 	for (o = opts; o->type != OPTION_END; o++)