diff --git a/Patchlist.changelog b/Patchlist.changelog index ab6ea473a..d64b6e3fb 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,12 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/51971df76b7baf9582e997694cf52b31842a6682 + 51971df76b7baf9582e997694cf52b31842a6682 net: skbuff: propagate shared-frag marker through frag-transfer helpers + +https://gitlab.com/cki-project/kernel-ark/-/commit/7bfe00fc9bf6fd1386c2602499a73d0d88a21d37 + 7bfe00fc9bf6fd1386c2602499a73d0d88a21d37 Revert v3 of the fragnesia fixes as v4 covers an additional case + +https://gitlab.com/cki-project/kernel-ark/-/commit/f52ec337a3f4e4d40707197a07dc0eda386be1f2 + f52ec337a3f4e4d40707197a07dc0eda386be1f2 Bluetooth: btmtk: accept too short WMT FUNC_CTRL events + https://gitlab.com/cki-project/kernel-ark/-/commit/8774aeeee61b9ff93ec4d12e871938c41c57612b 8774aeeee61b9ff93ec4d12e871938c41c57612b net: skbuff: propagate shared-frag marker through frag-transfer helpers diff --git a/kernel.changelog b/kernel.changelog index a91bd453e..ff1aae4ae 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,10 @@ +* Fri May 15 2026 Justin M. Forbes [7.0.8-0] +- net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) +- Revert v3 of the fragnesia fixes as v4 covers an additional case (Justin M. Forbes) +- Bluetooth: btmtk: accept too short WMT FUNC_CTRL events (Pauli Virtanen) +- Linux v7.0.8 +Resolves: + * Thu May 14 2026 Justin M. Forbes [7.0.7-0] - net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) - Revert old fragnesia fixes in favor of more complete solution (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index d660d55d6..03920189a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -187,18 +187,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 7.0.7 -%define specversion 7.0.7 +%define specrpmversion 7.0.8 +%define specversion 7.0.8 %define patchversion 7.0 %define pkgrelease 200 %define kversion 7 -%define tarfile_release 7.0.7 +%define tarfile_release 7.0.8 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 7.0.7 +%define kabiversion 7.0.8 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4825,6 +4825,12 @@ fi\ # # %changelog +* Fri May 15 2026 Justin M. Forbes [7.0.8-0] +- net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) +- Revert v3 of the fragnesia fixes as v4 covers an additional case (Justin M. Forbes) +- Bluetooth: btmtk: accept too short WMT FUNC_CTRL events (Pauli Virtanen) +- Linux v7.0.8 + * Thu May 14 2026 Justin M. Forbes [7.0.7-0] - net: skbuff: propagate shared-frag marker through frag-transfer helpers (Hyunwoo Kim) - Revert old fragnesia fixes in favor of more complete solution (Justin M. Forbes) diff --git a/patch-7.0-redhat.patch b/patch-7.0-redhat.patch index 54a237c82..cd5933fec 100644 --- a/patch-7.0-redhat.patch +++ b/patch-7.0-redhat.patch @@ -24,6 +24,7 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + drivers/ata/libahci.c | 18 + + drivers/bluetooth/btmtk.c | 4 +- drivers/char/ipmi/ipmi_dmi.c | 15 + drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + @@ -66,7 +67,8 @@ include/linux/security.h | 9 + kernel/module/signing.c | 9 +- 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/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- @@ -74,7 +76,7 @@ security/lockdown/lockdown.c | 11 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - - 76 files changed, 5413 insertions(+), 545 deletions(-) + 78 files changed, 5414 insertions(+), 547 deletions(-) diff --git a/Documentation/admin-guide/media/amdisp4-1.rst b/Documentation/admin-guide/media/amdisp4-1.rst new file mode 100644 @@ -206,7 +208,7 @@ index d1cc0e12fe1f..985c66951475 100644 M: Felix Kuehling L: amd-gfx@lists.freedesktop.org diff --git a/Makefile b/Makefile -index a854e46c1171..d27fe4972921 100644 +index a0565b83ae40..af6f72ebe8f2 100644 --- a/Makefile +++ b/Makefile @@ -356,6 +356,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) @@ -973,6 +975,21 @@ index c79abdfcd7a9..e23bfb7f94c7 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); +diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c +index 31ff133b6159..a4b4dacfd2ad 100644 +--- a/drivers/bluetooth/btmtk.c ++++ b/drivers/bluetooth/btmtk.c +@@ -678,8 +678,8 @@ static int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev, + case BTMTK_WMT_FUNC_CTRL: + if (!skb_pull_data(data->evt_skb, + sizeof(wmt_evt_funcc->status))) { +- err = -EINVAL; +- goto err_free_skb; ++ status = BTMTK_WMT_ON_UNDONE; ++ break; + } + + wmt_evt_funcc = (struct btmtk_hci_wmt_evt_funcc *)wmt_evt; diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index 505e32911c34..26f7ee0ccf40 100644 --- a/drivers/char/ipmi/ipmi_dmi.c @@ -7500,7 +7517,7 @@ index 31d21de5b15a..9f8960789b2c 100644 return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index 43ee86dcf2ea..4cfb4886e1b2 100644 +index 43ee86dcf2ea..758b5225b874 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2258,6 +2258,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, @@ -7520,15 +7537,18 @@ index 43ee86dcf2ea..4cfb4886e1b2 100644 skb_len_add(skb, -shiftlen); skb_len_add(tgt, shiftlen); -@@ -6226,6 +6229,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 326b58ff1118..691fc76c5508 100644 +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -2606,6 +2606,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 25a50b559..008d915b7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-7.0.7.tar.xz) = 87645178f23e610cb27d7364750bb14dd0ab05da01fb1d9479627d7bed3fc440b45420fbb6f39b613e6287449167586377e090af545e1dbcb682199f694dcafb -SHA512 (kernel-abi-stablelists-7.0.7.tar.xz) = 7aaea9f2c6bc398712e27c1d1caa8d676c1a991820df602a95cb4cd869075e9281b0cbe7f4147580403e94b0e8cd4d5f85a45017d1b59449f81c2e23177f750a -SHA512 (kernel-kabi-dw-7.0.7.tar.xz) = ed74d36dbfd413db308f05e09a686c3658437141f0cb13fe55d8e12f312d41bbe5616e8ab8cbbf8302ae8fdd325e7a0b8523a785b283f7275007a02849b675eb +SHA512 (linux-7.0.8.tar.xz) = a25defd60059d83906c4f3c2c27078d138d63c4706d8ba610ad40ff9657d7d4191b3660626dc334bd70bb25488f93a7d7f1b584602c5de1bbdd7a6c1f128df1e +SHA512 (kernel-abi-stablelists-7.0.8.tar.xz) = a36cdf7eb13cd3dba09c1b38a15313a7fbd1dd7f4ccfd91f3cca1a6c13732217fb1832a53545cbff509cafd7316ee345834f1c48a866a355812a51c28b16d7b0 +SHA512 (kernel-kabi-dw-7.0.8.tar.xz) = 7bb93855824bfc0c4f362a3e3434ea7deaf7923d7be21f84e42bbdd07b4a2ef8f245cd3b2643f2085718029ff69a5b61017d29a7b1d9fd44073bf4bdfdee5672