diff --git a/Makefile.rhelver b/Makefile.rhelver index 8022cf991..c20a0c0eb 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 = 26 +RHEL_RELEASE = 27 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 68c63a064..75f48d8c9 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,11 +1,11 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/8c47d732e0be28d28fde9603350a24599570887d - 8c47d732e0be28d28fde9603350a24599570887d net: skbuff: propagate shared-frag marker through frag-transfer helpers +https://gitlab.com/cki-project/kernel-ark/-/commit/fa6fe2ab6433bcfcbc8dee7e1685175158e74100 + fa6fe2ab6433bcfcbc8dee7e1685175158e74100 net: skbuff: propagate shared-frag marker through frag-transfer helpers -https://gitlab.com/cki-project/kernel-ark/-/commit/aa63d791eb0727b77cc0a45d3277e77095a00112 - aa63d791eb0727b77cc0a45d3277e77095a00112 Revert "net: skbuff: propagate shared-frag marker through frag-transfer helpers" +https://gitlab.com/cki-project/kernel-ark/-/commit/14a54c42c45616deb8f7036872ff4d6c763a3f72 + 14a54c42c45616deb8f7036872ff4d6c763a3f72 Revert "net: skbuff: propagate shared-frag marker through frag-transfer helpers" -https://gitlab.com/cki-project/kernel-ark/-/commit/29d9e149d8732dc86232d84cc4cabc4c58721561 - 29d9e149d8732dc86232d84cc4cabc4c58721561 net: skbuff: propagate shared-frag marker through frag-transfer helpers +https://gitlab.com/cki-project/kernel-ark/-/commit/9b348238805b8425d80ee0d228ad56bd7ae7b6b0 + 9b348238805b8425d80ee0d228ad56bd7ae7b6b0 net: skbuff: propagate shared-frag marker through frag-transfer helpers https://gitlab.com/cki-project/kernel-ark/-/commit/49dc112a24f8c571d32554e8a1dfdc74c0140b42 49dc112a24f8c571d32554e8a1dfdc74c0140b42 redhat: rh_flags: mark !CONFIG_RHEL_DIFFERENCES stubs as static inline diff --git a/kernel.changelog b/kernel.changelog index aa954f1e8..c69e1c2a2 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,9 +1,13 @@ -* Thu May 14 2026 Fedora Kernel Team [7.1.0-0.rc3.e1914add2799.26] +* Fri May 15 2026 Fedora Kernel Team [7.1.0-0.rc3.70eda68668d1.27] - net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) - disable selftests by default for now (Thorsten Leemhuis) Resolves: +* Fri May 15 2026 Fedora Kernel Team [7.1.0-0.rc3.70eda68668d1.26] +- Linux v7.1.0-0.rc3.70eda68668d1 +Resolves: + * Thu May 14 2026 Fedora Kernel Team [7.1.0-0.rc3.e1914add2799.25] - Linux v7.1.0-0.rc3.e1914add2799 Resolves: diff --git a/kernel.spec b/kernel.spec index d248270fc..a4ac93a1c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -190,13 +190,13 @@ Summary: The Linux kernel %define specrpmversion 7.1.0 %define specversion 7.1.0 %define patchversion 7.1 -%define pkgrelease 0.rc3.260514ge1914add2799.26 +%define pkgrelease 0.rc3.260515g70eda68668d1.27 %define kversion 7 -%define tarfile_release 7.1-rc3-39-ge1914add2799 +%define tarfile_release 7.1-rc3-200-g70eda68668d1 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.260514ge1914add2799.26%{?buildid}%{?dist} +%define specrelease 0.rc3.260515g70eda68668d1.27%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 7.1.0 @@ -4847,15 +4847,18 @@ fi\ # # %changelog -* Thu May 14 2026 Justin M. Forbes [7.1.0-0.rc3.260514ge1914add2799.26] +* Fri May 15 2026 Justin M. Forbes [7.1.0-0.rc3.260515g70eda68668d1.27] - net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) - Revert "net: skbuff: propagate shared-frag marker through frag-transfer helpers" (Justin M. Forbes) -* Thu May 14 2026 Fedora Kernel Team [7.1.0-0.rc3.e1914add2799.26] +* Fri May 15 2026 Fedora Kernel Team [7.1.0-0.rc3.70eda68668d1.27] - net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) - disable selftests by default for now (Thorsten Leemhuis) +* Fri May 15 2026 Fedora Kernel Team [7.1.0-0.rc3.70eda68668d1.26] +- Linux v7.1.0-0.rc3.70eda68668d1 + * Thu May 14 2026 Fedora Kernel Team [7.1.0-0.rc3.e1914add2799.25] - Linux v7.1.0-0.rc3.e1914add2799 diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch index f4f3b9ac4..6ffcf30ba 100644 --- a/patch-7.1-redhat.patch +++ b/patch-7.1-redhat.patch @@ -71,7 +71,8 @@ kernel/rh_messages.h | 334 +++++++++++++ kernel/rh_waived.c | 147 ++++++ net/core/gro.c | 4 + - net/core/skbuff.c | 5 + + net/core/skbuff.c | 3 + + net/ipv4/tcp_output.c | 1 + scripts/Makefile.lib | 3 + scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + @@ -81,7 +82,7 @@ tools/testing/selftests/bpf/DENYLIST.rhel | 76 +++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- - 83 files changed, 2909 insertions(+), 243 deletions(-) + 84 files changed, 2908 insertions(+), 243 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 4d0f545fb3ec..767989050205 100644 @@ -4441,7 +4442,7 @@ index 31d21de5b15a..9f8960789b2c 100644 return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index 7dad68e3b518..7cd388504297 100644 +index 7dad68e3b518..b45fac03af38 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2248,6 +2248,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, @@ -4461,15 +4462,18 @@ index 7dad68e3b518..7cd388504297 100644 skb_len_add(skb, -shiftlen); skb_len_add(tgt, shiftlen); -@@ -6200,6 +6203,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, - from_shinfo->frags, - from_shinfo->nr_frags * sizeof(skb_frag_t)); - to_shinfo->nr_frags += from_shinfo->nr_frags; -+ if (from_shinfo->nr_frags) -+ to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG; - - if (!skb_cloned(from)) - from_shinfo->nr_frags = 0; +diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c +index f9d8755705f7..6e4bb411dc04 100644 +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -2626,6 +2626,7 @@ static int tcp_clone_payload(struct sock *sk, struct sk_buff *to, + todo = min_t(int, skb_frag_size(fragfrom), + probe_size - len); + len += todo; ++ skb_shinfo(to)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + if (lastfrag && + skb_frag_page(fragfrom) == skb_frag_page(lastfrag) && + skb_frag_off(fragfrom) == skb_frag_off(lastfrag) + 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 831eb155f..6a8c87b2c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-7.1-rc3-39-ge1914add2799.tar.xz) = 9e88982ffdb00ef6cbd2c65ab9b0662e91131929f63d82386f87f830c04153b10b6a3417cea33f18c7308324f636ed746a15c1304dd19df3f4268caa7909c42c -SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = cc4f06358b354d7245b7207e1748bc2f5efaf66bd59e1d790f53f1404b285f3d60e7e3672b3c7d2d053541af61a958f9d46430fdc9b4208872f40fba3c77cbc9 -SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 558668fff734967a9cd0cee7db596e4548135d98b6aeb128bd00093fb7c9e6f59a04d2a6f5586928921c36ed17b7cdc773b4fbe71c9e3735bfeacddc9373a090 +SHA512 (linux-7.1-rc3-200-g70eda68668d1.tar.xz) = f881ad98f26ce246ac79df50710c5117ab5acbcdb7050b49b2f157464a83dc54e0eb2e4073f0f05455460a2f2b315fa37e85b5b4e0c5f8fcece33427ca33fb49 +SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = fea6510a85bd8e730e2eaa8e696c4286a43e156c26f535ca4e4bb75d2f506104102ef2c7eb7785c710750a0602ebcbef1b06c969d27aa9fb79565edfcdcb9ca0 +SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 7bb93855824bfc0c4f362a3e3434ea7deaf7923d7be21f84e42bbdd07b4a2ef8f245cd3b2643f2085718029ff69a5b61017d29a7b1d9fd44073bf4bdfdee5672