From 4917bb643d5a3f253f34adea7d7cca9a5758df24 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 22 Jul 2026 07:31:08 -0600 Subject: [PATCH] kernel-7.1.4-203 * Wed Jul 22 2026 Justin M. Forbes [7.1.4-3] - net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle (Jamal Hadi Salim) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 +++ kernel.changelog | 4 ++++ kernel.spec | 7 +++++-- patch-7.1-redhat.patch | 17 ++++++++++++++++- sources | 4 ++-- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 38f7de3f2..dbdb99ad3 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 2 +RHEL_RELEASE = 3 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 457252e94..bbac3757e 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/ce4210e437cef5c58d496117632473f6ad20f1d1 + ce4210e437cef5c58d496117632473f6ad20f1d1 net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle + https://gitlab.com/cki-project/kernel-ark/-/commit/038190229a7c4ce9fd78a0ece5998a483e917b10 038190229a7c4ce9fd78a0ece5998a483e917b10 Revert "PCI/MSI: Unmap MSI-X region on error" diff --git a/kernel.changelog b/kernel.changelog index 1b182f214..84d686d29 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Wed Jul 22 2026 Justin M. Forbes [7.1.4-3] +- net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle (Jamal Hadi Salim) +Resolves: + * Tue Jul 21 2026 Justin M. Forbes [7.1.4-2] - Revert "PCI/MSI: Unmap MSI-X region on error" (Yuanhe Shu) - Revert "btrfs: fix the file offset calculation inside btrfs_decompress_buf2page()" (Matthew Wilcox (Oracle)) diff --git a/kernel.spec b/kernel.spec index 1ba4caddc..39f3c3e7f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -190,13 +190,13 @@ Summary: The Linux kernel %define specrpmversion 7.1.4 %define specversion 7.1.4 %define patchversion 7.1 -%define pkgrelease 202 +%define pkgrelease 203 %define kversion 7 %define tarfile_release 7.1.4 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 202%{?buildid}%{?dist} +%define specrelease 203%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 7.1.4 @@ -4857,6 +4857,9 @@ fi\ # # %changelog +* Wed Jul 22 2026 Justin M. Forbes [7.1.4-3] +- net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle (Jamal Hadi Salim) + * Tue Jul 21 2026 Justin M. Forbes [7.1.4-2] - Revert "PCI/MSI: Unmap MSI-X region on error" (Yuanhe Shu) - Revert "btrfs: fix the file offset calculation inside btrfs_decompress_buf2page()" (Matthew Wilcox (Oracle)) diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch index 5904c8433..4ec6e65e8 100644 --- a/patch-7.1-redhat.patch +++ b/patch-7.1-redhat.patch @@ -53,6 +53,7 @@ include/linux/security.h | 9 + kernel/module/signing.c | 9 +- net/can/bcm.c | 37 +- + net/sched/cls_api.c | 3 + scripts/Makefile.lib | 3 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- @@ -63,7 +64,7 @@ tools/testing/selftests/bpf/DENYLIST.rhel | 76 ++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - - 65 files changed, 2100 insertions(+), 190 deletions(-) + 66 files changed, 2103 insertions(+), 190 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f74da642290a..06c8bb2075e6 100644 @@ -3257,6 +3258,20 @@ index a4bef2c48a55..bdf53241bd7b 100644 } module_init(bcm_module_init); +diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c +index 20f7f9ee0b35..3e67600a4a1a 100644 +--- a/net/sched/cls_api.c ++++ b/net/sched/cls_api.c +@@ -4049,6 +4049,9 @@ struct sk_buff *tcf_qevent_handle(struct tcf_qevent *qe, struct Qdisc *sch, stru + skb_do_redirect(skb); + *ret = __NET_XMIT_STOLEN; + return NULL; ++ case TC_ACT_CONSUMED: ++ *ret = __NET_XMIT_STOLEN; ++ return NULL; + } + + return skb; diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0718e39cedda..10e94a1b8b6e 100644 --- a/scripts/Makefile.lib diff --git a/sources b/sources index 4f68294f6..dd28e1298 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-7.1.4.tar.xz) = 164f7c0353dfcf1eaacf886530273271d473314a9f99d9441a63bfc24368c8d2f194552bd4800dd440bf824598cbd74263b1b544dc61307517b8208acf9b4a7a -SHA512 (kernel-abi-stablelists-7.1.4.tar.xz) = dc58ac8f77c6ef6dfb5d7ee1891bbcf5f2b9bc45ef0791b7243af7679fde58851ad15e72f003fd6f94d1afe5eb51bd93c262dc18b8e44381e5352ed7a82785b9 -SHA512 (kernel-kabi-dw-7.1.4.tar.xz) = bf880002eb61ae0c19a5692db25c281152d08404e60023770660fe3bbbd57055ae1a7a0ec770e57a871bd3d8a531d401951743b95731cb93ff26a0623f9bd217 +SHA512 (kernel-abi-stablelists-7.1.4.tar.xz) = 374a2880e321d511b020f463c9e2bda540da26f93d717c92f8765d35e1f0d15dce201f0a08c18a8dea8f785532a78924cfa603d05865188c48e2336d6953913e +SHA512 (kernel-kabi-dw-7.1.4.tar.xz) = 8b0322a90c6897047f21ab53a9aa4875df9ad1f58c4745923ed75aef9a968eb2eea272b80124a88295df61d500d4a67f698a2529fd6811604b613867f0e27fa8