From ce1d17b45bd8c36f070562ba23ef05e299957b9e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 28 Apr 2025 07:34:17 -0600 Subject: [PATCH] kernel-6.15.0-0.rc4.35 * Mon Apr 28 2025 Fedora Kernel Team [6.15.0-0.rc4.35] - Linux v6.15.0-0.rc4 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rt-64k-debug-fedora.config | 2 +- kernel-aarch64-rt-64k-fedora.config | 2 +- kernel-aarch64-rt-debug-fedora.config | 2 +- kernel-aarch64-rt-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-riscv64-debug-fedora.config | 2 +- kernel-riscv64-fedora.config | 2 +- kernel-riscv64-rt-debug-fedora.config | 2 +- kernel-riscv64-rt-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rt-debug-fedora.config | 2 +- kernel-x86_64-rt-fedora.config | 2 +- kernel.changelog | 12 ++++ kernel.spec | 18 +++++- patch-6.15-redhat.patch | 71 +---------------------- sources | 6 +- 25 files changed, 54 insertions(+), 95 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e7ac443d8..5d060b30e 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 = 32 +RHEL_RELEASE = 35 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index a60a2acae..3df639d95 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6093,7 +6093,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 0caff5391..515654f18 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6065,7 +6065,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d4017d461..c9af76f6f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6092,7 +6092,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d0ac23bf0..57c74161d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6064,7 +6064,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index 8c36b2e4b..fef9260a5 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -6101,7 +6101,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index a5943c63d..734ecc24e 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -6073,7 +6073,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index ba060ca41..99ee4de3a 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -6097,7 +6097,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 341742cda..a57eb1f85 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -6069,7 +6069,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 1f4d5de47..b5d26605a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5060,7 +5060,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index a42049623..de13bf886 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5031,7 +5031,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 44c841b1b..6381e4b79 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -5089,7 +5089,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index a2cb87b04..4c81c444c 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -5060,7 +5060,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index c0e714434..98d308e5b 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -5094,7 +5094,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index 78c6265d5..d3d49f088 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -5065,7 +5065,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4d6fc71c4..4b3093795 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5032,7 +5032,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b5353a2bc..29da53b79 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5003,7 +5003,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 1478b7c02..2578ac988 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5491,7 +5491,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6b5b9a6f7..ead4fc451 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5464,7 +5464,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 4f1218d72..90110be6b 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -5496,7 +5496,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 62cbe6ba4..a06c16825 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -5469,7 +5469,7 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m # CONFIG_PCI_PWRCTL_SLOT is not set CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel.changelog b/kernel.changelog index 22ae55af1..0df258433 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Mon Apr 28 2025 Fedora Kernel Team [6.15.0-0.rc4.35] +- Linux v6.15.0-0.rc4 +Resolves: + +* Sun Apr 27 2025 Fedora Kernel Team [6.15.0-0.rc3.5bc1018675ec.34] +- Linux v6.15.0-0.rc3.5bc1018675ec +Resolves: + +* Sat Apr 26 2025 Fedora Kernel Team [6.15.0-0.rc3.f1a3944c860b.33] +- Linux v6.15.0-0.rc3.f1a3944c860b +Resolves: + * Fri Apr 25 2025 Fedora Kernel Team [6.15.0-0.rc3.02ddfb981de8.32] - gitlab-ci: enable pipelines for rt-64k (Clark Williams) - rt-64k: Enable building 64k page-size RT kernel (Clark Williams) diff --git a/kernel.spec b/kernel.spec index 90e714ef4..022bd59a5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.15.0 %define specversion 6.15.0 %define patchversion 6.15 -%define pkgrelease 0.rc3.20250425git02ddfb981de8.32 +%define pkgrelease 0.rc4.35 %define kversion 6 -%define tarfile_release 6.15-rc3-94-g02ddfb981de8 +%define tarfile_release 6.15-rc4 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20250425git02ddfb981de8.32%{?buildid}%{?dist} +%define specrelease 0.rc4.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4259,6 +4259,18 @@ fi\ # # %changelog +* Mon Apr 28 2025 Justin M. Forbes [6.15.0-0.rc4.35] +- Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) + +* Mon Apr 28 2025 Fedora Kernel Team [6.15.0-0.rc4.35] +- Linux v6.15.0-0.rc4 + +* Sun Apr 27 2025 Fedora Kernel Team [6.15.0-0.rc3.5bc1018675ec.34] +- Linux v6.15.0-0.rc3.5bc1018675ec + +* Sat Apr 26 2025 Fedora Kernel Team [6.15.0-0.rc3.f1a3944c860b.33] +- Linux v6.15.0-0.rc3.f1a3944c860b + * Fri Apr 25 2025 Fedora Kernel Team [6.15.0-0.rc3.02ddfb981de8.32] - gitlab-ci: enable pipelines for rt-64k (Clark Williams) - rt-64k: Enable building 64k page-size RT kernel (Clark Williams) diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 31bb120d8..527062a86 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -34,7 +34,6 @@ drivers/media/i2c/ov08x40.c | 2 +- drivers/message/fusion/mptsas.c | 5 + drivers/message/fusion/mptspi.c | 5 + - drivers/misc/mei/vsc-tp.c | 26 +- drivers/net/wireguard/main.c | 6 + drivers/pci/pci-driver.c | 9 + drivers/pci/quirks.c | 24 + @@ -76,7 +75,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 78 files changed, 2740 insertions(+), 219 deletions(-) + 77 files changed, 2725 insertions(+), 208 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index d9fd26b95b34..aeafaa431ecd 100644 @@ -191,7 +190,7 @@ index 000000000000..85771d74c34f + +endmenu diff --git a/Makefile b/Makefile -index 07f818186151..78339247ec0b 100644 +index 5aa9ee52a765..f02d241e6b4e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1947,70 +1946,6 @@ index a3901fbfac4f..83add1994d2c 100644 {0} /* Terminating entry */ }; MODULE_DEVICE_TABLE(pci, mptspi_pci_table); -diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c -index 7be1649b1972..fa553d4914b6 100644 ---- a/drivers/misc/mei/vsc-tp.c -+++ b/drivers/misc/mei/vsc-tp.c -@@ -36,20 +36,24 @@ - #define VSC_TP_XFER_TIMEOUT_BYTES 700 - #define VSC_TP_PACKET_PADDING_SIZE 1 - #define VSC_TP_PACKET_SIZE(pkt) \ -- (sizeof(struct vsc_tp_packet) + le16_to_cpu((pkt)->len) + VSC_TP_CRC_SIZE) -+ (sizeof(struct vsc_tp_packet_hdr) + le16_to_cpu((pkt)->hdr.len) + VSC_TP_CRC_SIZE) - #define VSC_TP_MAX_PACKET_SIZE \ -- (sizeof(struct vsc_tp_packet) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) -+ (sizeof(struct vsc_tp_packet_hdr) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) - #define VSC_TP_MAX_XFER_SIZE \ - (VSC_TP_MAX_PACKET_SIZE + VSC_TP_XFER_TIMEOUT_BYTES) - #define VSC_TP_NEXT_XFER_LEN(len, offset) \ -- (len + sizeof(struct vsc_tp_packet) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) -+ (len + sizeof(struct vsc_tp_packet_hdr) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) - --struct vsc_tp_packet { -+struct vsc_tp_packet_hdr { - __u8 sync; - __u8 cmd; - __le16 len; - __le32 seq; -- __u8 buf[] __counted_by(len); -+}; -+ -+struct vsc_tp_packet { -+ struct vsc_tp_packet_hdr hdr; -+ __u8 buf[VSC_TP_MAX_XFER_SIZE - sizeof(struct vsc_tp_packet_hdr)]; - }; - - struct vsc_tp { -@@ -158,12 +162,12 @@ static int vsc_tp_dev_xfer(struct vsc_tp *tp, void *obuf, void *ibuf, size_t len - static int vsc_tp_xfer_helper(struct vsc_tp *tp, struct vsc_tp_packet *pkt, - void *ibuf, u16 ilen) - { -- int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet); -+ int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet_hdr); - int next_xfer_len = VSC_TP_PACKET_SIZE(pkt) + VSC_TP_XFER_TIMEOUT_BYTES; - u8 *src, *crc_src, *rx_buf = tp->rx_buf; - int count_down = VSC_TP_MAX_XFER_COUNT; - u32 recv_crc = 0, crc = ~0; -- struct vsc_tp_packet ack; -+ struct vsc_tp_packet_hdr ack; - u8 *dst = (u8 *)&ack; - bool synced = false; - -@@ -280,10 +284,10 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmd, const void *obuf, size_t olen, - - guard(mutex)(&tp->mutex); - -- pkt->sync = VSC_TP_PACKET_SYNC; -- pkt->cmd = cmd; -- pkt->len = cpu_to_le16(olen); -- pkt->seq = cpu_to_le32(++tp->seq); -+ pkt->hdr.sync = VSC_TP_PACKET_SYNC; -+ pkt->hdr.cmd = cmd; -+ pkt->hdr.len = cpu_to_le16(olen); -+ pkt->hdr.seq = cpu_to_le32(++tp->seq); - memcpy(pkt->buf, obuf, olen); - - crc = ~crc32(~0, (u8 *)pkt, sizeof(pkt) + olen); diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c index a00671b58701..eeef2766b8b3 100644 --- a/drivers/net/wireguard/main.c @@ -3278,7 +3213,7 @@ index ba6b6118cf50..76f8fd7c7ee1 100644 long bpf_jit_limit_max __read_mostly; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 9794446bc8c6..48ad59d23531 100644 +index 64c3393e8270..827ab64621bb 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ diff --git a/sources b/sources index f9308db69..cab0c36cf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc3-94-g02ddfb981de8.tar.xz) = bd94d2aefd385c35d974346338ea26c03ec3fdf2f937ffabddb2e301f748a30685cf7acf7e8b95e1396abeb5fd06bfdee36ad081ba6be59ef7fc61499e2f668b -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 71b2dbc9eeef34d8c991ca4f16b170582800e98cf120e7fa277c105cd1b99666d72a0932f89019fdc5ee284a50e41563cc0ff34d2d153448c53a1183a13a3fb6 -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = ab66c5ca97f1569c4bd51bef69e49f7eb110b12e97b0f14606aad41125f106c758d8d68bd2751ce696716d0adf676d2d6a4431ba029603d1383cb30896ec8e46 +SHA512 (linux-6.15-rc4.tar.xz) = 55c90f1b3f5b2cf7aae2df918c52a26e81ff01033285ef01ec67cc2106f02e4eec6c6cd665c87f84f2791259aedd6f73f336104a6c83168824f35a847a9f9442 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = dae25beb186bb412e32f6ff791674dc5b377bc9ab2aa06ebb9d0ee6bec4fb5eb6333553920bce4a7e1b37417089f7600957f1483701826dd54a27926c3e9fa6e +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = bce66d8fd5912b0bd9c08eb4133c4e4cb9fbb0d8e81d03a83502dac756b0ee42d915c006518d49d495f7fad07e9b5b3839ffddaba88ede9f6d28c2d8c33734b3