From 7cf8deae043bafee9d083a287b5f53b2bd5efa1d Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Fri, 7 Mar 2025 18:03:07 -0300 Subject: [PATCH] kernel-6.13.6-200 * Fri Mar 07 2025 Augusto Caringi [6.13.6-0] - Fix up some debug module loading issues due to BTF mismatch (Justin M. Forbes) - Linux v6.13.6 Resolves: Signed-off-by: Augusto Caringi --- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-rt-debug-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 4 +- kernel-ppc64le-fedora.config | 2 +- kernel-riscv64-debug-fedora.config | 4 +- kernel-riscv64-fedora.config | 2 +- kernel-riscv64-rt-debug-fedora.config | 4 +- kernel-riscv64-rt-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 4 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 4 +- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rt-debug-fedora.config | 4 +- kernel-x86_64-rt-fedora.config | 2 +- kernel.changelog | 5 + kernel.spec | 12 +- patch-6.13-redhat.patch | 193 +++++++++---------------- sources | 6 +- 19 files changed, 108 insertions(+), 150 deletions(-) diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 3f0f993a3..8777cbd04 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -4862,7 +4862,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 98393de29..50ad68792 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4862,7 +4862,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 1b4e507a8..2c2bc13e2 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -4867,7 +4867,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index e64962796..5fd01fa8a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1360,7 +1360,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_RWSEMS=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SPINLOCK=y @@ -3982,7 +3982,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index c7e8f914d..3c3201259 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1351,7 +1351,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=0 # CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_SG is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_SPINLOCK is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index a80e1482b..7e2394314 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -1385,7 +1385,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_RWSEMS=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SPINLOCK=y @@ -3992,7 +3992,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 2ede0d3cd..bd2dbc0d0 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -1376,7 +1376,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=0 # CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_SG is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_SPINLOCK is not set diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index cbdc006e0..b7fa84d92 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -1387,7 +1387,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_RWSEMS=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SPINLOCK=y @@ -3997,7 +3997,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index a582b5eee..c6c5912d1 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -1378,7 +1378,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_SG is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_SPINLOCK is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 864d28392..9a271b919 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1370,7 +1370,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_RWSEMS=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SPINLOCK=y @@ -3956,7 +3956,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 43a84832a..44a9b93e6 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1361,7 +1361,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=0 # CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_SG is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_SPINLOCK is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6cda5e2ba..a0ee48c70 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1473,7 +1473,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_RWSEMS=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SPINLOCK=y @@ -4370,7 +4370,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 9b797884d..c30aa5676 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1464,7 +1464,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=0 # CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_SG is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_SPINLOCK is not set diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 5201d85c4..d61bce8e6 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -1475,7 +1475,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_RWSEMS=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SPINLOCK=y @@ -4375,7 +4375,7 @@ CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" -# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 80b03d67f..c1b860cbd 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -1466,7 +1466,7 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_SG is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_SPINLOCK is not set diff --git a/kernel.changelog b/kernel.changelog index bab612141..b5ad6183d 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Fri Mar 07 2025 Augusto Caringi [6.13.6-0] +- Fix up some debug module loading issues due to BTF mismatch (Justin M. Forbes) +- Linux v6.13.6 +Resolves: + * Thu Feb 27 2025 Justin M. Forbes [6.13.5-0] - fuse: revert back to __readahead_folio() for readahead (Joanne Koong) - Linux v6.13.5 diff --git a/kernel.spec b/kernel.spec index e4a5f9ea1..2bd4e30f1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,18 +159,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.13.5 -%define specversion 6.13.5 +%define specrpmversion 6.13.6 +%define specversion 6.13.6 %define patchversion 6.13 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.13.5 +%define tarfile_release 6.13.6 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.13.5 +%define kabiversion 6.13.6 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4166,6 +4166,10 @@ fi\ # # %changelog +* Fri Mar 07 2025 Augusto Caringi [6.13.6-0] +- Fix up some debug module loading issues due to BTF mismatch (Justin M. Forbes) +- Linux v6.13.6 + * Thu Feb 27 2025 Justin M. Forbes [6.13.5-0] - fuse: revert back to __readahead_folio() for readahead (Joanne Koong) - Linux v6.13.5 diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index 9031a60ef..40afd8daf 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -55,8 +55,6 @@ drivers/pci/quirks.c | 24 + drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + - fs/fuse/dev.c | 6 + - fs/fuse/file.c | 13 +- include/linux/crypto.h | 2 + include/linux/efi.h | 22 +- include/linux/hid-over-i2c.h | 117 ++ @@ -70,10 +68,10 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 72 files changed, 9181 insertions(+), 279 deletions(-) + 70 files changed, 9164 insertions(+), 277 deletions(-) diff --git a/Documentation/hid/index.rst b/Documentation/hid/index.rst -index af02cf7cfa82..baf156b44b58 100644 +index af02cf7cfa820..baf156b44b58a 100644 --- a/Documentation/hid/index.rst +++ b/Documentation/hid/index.rst @@ -18,4 +18,5 @@ Human Interface Devices (HID) @@ -84,7 +82,7 @@ index af02cf7cfa82..baf156b44b58 100644 amd-sfh-hid diff --git a/Documentation/hid/intel-thc-hid.rst b/Documentation/hid/intel-thc-hid.rst new file mode 100644 -index 000000000000..6c417205ac6a +index 0000000000000..6c417205ac6a5 --- /dev/null +++ b/Documentation/hid/intel-thc-hid.rst @@ -0,0 +1,568 @@ @@ -657,7 +655,7 @@ index 000000000000..6c417205ac6a +- HIDSPI: https://download.microsoft.com/download/c/a/0/ca07aef3-3e10-4022-b1e9-c98cea99465d/HidSpiProtocolSpec.pdf +- HIDI2C: https://download.microsoft.com/download/7/d/d/7dd44bb7-2a7a-4505-ac1c-7227d3d96d5b/hid-over-i2c-protocol-spec-v1-0.docx diff --git a/MAINTAINERS b/MAINTAINERS -index 0fa7c5728f1e..e404279c8610 100644 +index 0fa7c5728f1e6..e404279c86107 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11872,6 +11872,12 @@ S: Maintained @@ -674,7 +672,7 @@ index 0fa7c5728f1e..e404279c8610 100644 M: Srinivas Pandruvada L: platform-driver-x86@vger.kernel.org diff --git a/Makefile b/Makefile -index 56d5c11b6f1e..351e5f119381 100644 +index f49182f3bae14..1a1d23c1b2938 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -739,7 +737,7 @@ index 56d5c11b6f1e..351e5f119381 100644 @: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 202397be76d8..3d4ba33d4305 100644 +index 202397be76d80..3d4ba33d4305f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1228,9 +1228,9 @@ config HIGHMEM @@ -755,7 +753,7 @@ index 202397be76d8..3d4ba33d4305 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b0d00032479d..afb9544fb007 100644 +index b0d00032479d6..afb9544fb0074 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h @@ -139,6 +139,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, @@ -767,7 +765,7 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 7d12a1305fc9..569b92def9b7 100644 +index 7d12a1305fc99..569b92def9b79 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2497,3 +2497,8 @@ int ipl_report_free(struct ipl_report *report) @@ -780,7 +778,7 @@ index 7d12a1305fc9..569b92def9b7 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 99f165726ca9..70b4ef0d86b8 100644 +index 99f165726ca9e..70b4ef0d86b86 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -802,7 +800,7 @@ index 99f165726ca9..70b4ef0d86b8 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index f1fea506e20f..6af50d80f54a 100644 +index f1fea506e20f4..6af50d80f54aa 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -849,7 +847,7 @@ index f1fea506e20f..6af50d80f54a 100644 reserve_initrd(); diff --git a/arch/x86/tools/insn_decoder_test.c b/arch/x86/tools/insn_decoder_test.c -index 472540aeabc2..366e07546344 100644 +index 472540aeabc23..366e07546344b 100644 --- a/arch/x86/tools/insn_decoder_test.c +++ b/arch/x86/tools/insn_decoder_test.c @@ -106,7 +106,7 @@ static void parse_args(int argc, char **argv) @@ -862,7 +860,7 @@ index 472540aeabc2..366e07546344 100644 int main(int argc, char **argv) { diff --git a/crypto/akcipher.c b/crypto/akcipher.c -index 72c82d9aa077..da1ac5de8252 100644 +index 72c82d9aa0778..da1ac5de8252d 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -141,8 +141,7 @@ int crypto_register_akcipher(struct akcipher_alg *alg) @@ -876,7 +874,7 @@ index 72c82d9aa077..da1ac5de8252 100644 alg->set_priv_key = akcipher_default_set_key; diff --git a/crypto/dh.c b/crypto/dh.c -index afc0fd847761..e13258c3d1d1 100644 +index afc0fd8477613..e13258c3d1d1a 100644 --- a/crypto/dh.c +++ b/crypto/dh.c @@ -227,10 +227,35 @@ static int dh_compute_value(struct kpp_request *req) @@ -916,7 +914,7 @@ index afc0fd847761..e13258c3d1d1 100644 } diff --git a/crypto/seqiv.c b/crypto/seqiv.c -index 17e11d51ddc3..9c136a3b6267 100644 +index 17e11d51ddc36..9c136a3b62679 100644 --- a/crypto/seqiv.c +++ b/crypto/seqiv.c @@ -132,6 +132,19 @@ static int seqiv_aead_decrypt(struct aead_request *req) @@ -949,7 +947,7 @@ index 17e11d51ddc3..9c136a3b6267 100644 inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx); diff --git a/crypto/sig.c b/crypto/sig.c -index 5e1f1f739da2..3fc9fffa718e 100644 +index 5e1f1f739da2e..3fc9fffa718e6 100644 --- a/crypto/sig.c +++ b/crypto/sig.c @@ -108,8 +108,7 @@ static int sig_prepare_alg(struct sig_alg *alg) @@ -963,7 +961,7 @@ index 5e1f1f739da2..3fc9fffa718e 100644 alg->verify = sig_default_verify; if (!alg->set_priv_key) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index 1f5f48ab18c7..00a3810bff51 100644 +index 1f5f48ab18c74..00a3810bff51e 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4200,7 +4200,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, @@ -1000,7 +998,7 @@ index 1f5f48ab18c7..00a3810bff51 100644 .kpp = __VECS(ecdh_p384_tv_template) } diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 20d757687e3d..90a13f20f052 100644 +index 20d757687e3d9..90a13f20f052b 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -142,6 +142,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) @@ -1019,7 +1017,7 @@ index 20d757687e3d..90a13f20f052 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index 1687483ff319..390b67f19181 100644 +index 1687483ff319e..390b67f19181a 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -1062,7 +1060,7 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 74dcccdc6482..d6265ddc87ef 100644 +index 74dcccdc6482b..d6265ddc87efe 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1082,7 +1080,7 @@ index 74dcccdc6482..d6265ddc87ef 100644 acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave, diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index fdfa7b266218..f5f8ba457c93 100644 +index fdfa7b2662180..f5f8ba457c93f 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -1111,7 +1109,7 @@ index fdfa7b266218..f5f8ba457c93 100644 tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c -index bbf7029e224b..cf7faa970dd6 100644 +index bbf7029e224be..cf7faa970dd65 100644 --- a/drivers/char/ipmi/ipmi_dmi.c +++ b/drivers/char/ipmi/ipmi_dmi.c @@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void) @@ -1137,7 +1135,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index e12b531f5c2f..082707f8dff8 100644 +index e12b531f5c2f3..082707f8dff8c 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -1172,7 +1170,7 @@ index e12b531f5c2f..082707f8dff8 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile -index a2d0009560d0..4f3486e6a84b 100644 +index a2d0009560d0f..4f3486e6a84b2 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -1184,7 +1182,7 @@ index a2d0009560d0..4f3486e6a84b 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 1992d1176c7e..666e6845bd92 100644 +index 1992d1176c7ed..666e6845bd921 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -1330,7 +1328,7 @@ index 1992d1176c7e..666e6845bd92 100644 diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 -index 000000000000..de0a3714a5d4 +index 0000000000000..de0a3714a5d44 --- /dev/null +++ b/drivers/firmware/efi/secureboot.c @@ -0,0 +1,38 @@ @@ -1373,7 +1371,7 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig -index 4d2a89d65b65..c57927529f8a 100644 +index 4d2a89d65b658..c57927529f8a4 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -1386,4 +1386,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig" @@ -1384,7 +1382,7 @@ index 4d2a89d65b65..c57927529f8a 100644 + endif # HID_SUPPORT diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index 24de45f3677d..482b096eea28 100644 +index 24de45f3677d1..482b096eea280 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -171,3 +171,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/ @@ -1394,7 +1392,7 @@ index 24de45f3677d..482b096eea28 100644 + +obj-$(CONFIG_INTEL_THC_HID) += intel-thc-hid/ diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index d4af17fdba46..154f0403cbf4 100644 +index d4af17fdba467..154f0403cbf4c 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) @@ -1497,7 +1495,7 @@ index d4af17fdba46..154f0403cbf4 100644 diff --git a/drivers/hid/intel-thc-hid/Kconfig b/drivers/hid/intel-thc-hid/Kconfig new file mode 100644 -index 000000000000..91ec84902db8 +index 0000000000000..91ec84902db8f --- /dev/null +++ b/drivers/hid/intel-thc-hid/Kconfig @@ -0,0 +1,43 @@ @@ -1546,7 +1544,7 @@ index 000000000000..91ec84902db8 +endmenu diff --git a/drivers/hid/intel-thc-hid/Makefile b/drivers/hid/intel-thc-hid/Makefile new file mode 100644 -index 000000000000..6f762d87af07 +index 0000000000000..6f762d87af070 --- /dev/null +++ b/drivers/hid/intel-thc-hid/Makefile @@ -0,0 +1,22 @@ @@ -1574,7 +1572,7 @@ index 000000000000..6f762d87af07 +ccflags-y += -I $(src)/intel-thc diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c new file mode 100644 -index 000000000000..2de93f4a25ca +index 0000000000000..2de93f4a25ca4 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c @@ -0,0 +1,969 @@ @@ -2549,7 +2547,7 @@ index 000000000000..2de93f4a25ca +MODULE_IMPORT_NS("INTEL_THC"); diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h new file mode 100644 -index 000000000000..6ddb584bd611 +index 0000000000000..6ddb584bd6110 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h @@ -0,0 +1,186 @@ @@ -2741,7 +2739,7 @@ index 000000000000..6ddb584bd611 +#endif /* _QUICKI2C_DEV_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.c b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.c new file mode 100644 -index 000000000000..5c3ec95bb3fd +index 0000000000000..5c3ec95bb3fdd --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.c @@ -0,0 +1,166 @@ @@ -2913,7 +2911,7 @@ index 000000000000..5c3ec95bb3fd +} diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.h b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.h new file mode 100644 -index 000000000000..e80df5f339fe +index 0000000000000..e80df5f339fef --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.h @@ -0,0 +1,14 @@ @@ -2933,7 +2931,7 @@ index 000000000000..e80df5f339fe +#endif /* _QUICKI2C_HID_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.c b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.c new file mode 100644 -index 000000000000..f493df0d5dc4 +index 0000000000000..f493df0d5dc4e --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.c @@ -0,0 +1,224 @@ @@ -3163,7 +3161,7 @@ index 000000000000..f493df0d5dc4 +} diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.h b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.h new file mode 100644 -index 000000000000..bf4908cce59c +index 0000000000000..bf4908cce59cc --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.h @@ -0,0 +1,20 @@ @@ -3189,7 +3187,7 @@ index 000000000000..bf4908cce59c +#endif /* _QUICKI2C_PROTOCOL_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c new file mode 100644 -index 000000000000..4641e818dfa4 +index 0000000000000..4641e818dfa44 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c @@ -0,0 +1,987 @@ @@ -4182,7 +4180,7 @@ index 000000000000..4641e818dfa4 +MODULE_IMPORT_NS("INTEL_THC"); diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h new file mode 100644 -index 000000000000..75179bb26767 +index 0000000000000..75179bb267677 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h @@ -0,0 +1,172 @@ @@ -4360,7 +4358,7 @@ index 000000000000..75179bb26767 +#endif /* _QUICKSPI_DEV_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.c b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.c new file mode 100644 -index 000000000000..ad52e402c28a +index 0000000000000..ad52e402c28ac --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.c @@ -0,0 +1,165 @@ @@ -4531,7 +4529,7 @@ index 000000000000..ad52e402c28a +} diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.h b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.h new file mode 100644 -index 000000000000..f640fa876a40 +index 0000000000000..f640fa876a405 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.h @@ -0,0 +1,14 @@ @@ -4551,7 +4549,7 @@ index 000000000000..f640fa876a40 +#endif /* _QUICKSPI_HID_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c new file mode 100644 -index 000000000000..7373238ceb18 +index 0000000000000..7373238ceb18b --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c @@ -0,0 +1,414 @@ @@ -4971,7 +4969,7 @@ index 000000000000..7373238ceb18 +} diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.h b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.h new file mode 100644 -index 000000000000..775e29c1ed13 +index 0000000000000..775e29c1ed136 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.h @@ -0,0 +1,25 @@ @@ -5002,7 +5000,7 @@ index 000000000000..775e29c1ed13 +#endif /* _QUICKSPI_PROTOCOL_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c new file mode 100644 -index 000000000000..4fc78b5a04b5 +index 0000000000000..4fc78b5a04b5f --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c @@ -0,0 +1,1578 @@ @@ -6586,7 +6584,7 @@ index 000000000000..4fc78b5a04b5 +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.h b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.h new file mode 100644 -index 000000000000..0517fee2c668 +index 0000000000000..0517fee2c668b --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.h @@ -0,0 +1,116 @@ @@ -6708,7 +6706,7 @@ index 000000000000..0517fee2c668 +#endif /* _INTEL_THC_DEV_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c new file mode 100644 -index 000000000000..eb23bea77686 +index 0000000000000..eb23bea776864 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c @@ -0,0 +1,969 @@ @@ -7683,7 +7681,7 @@ index 000000000000..eb23bea77686 +EXPORT_SYMBOL_NS_GPL(thc_dma_write, "INTEL_THC"); diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h new file mode 100644 -index 000000000000..ca923ff2bef9 +index 0000000000000..ca923ff2bef99 --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h @@ -0,0 +1,146 @@ @@ -7835,7 +7833,7 @@ index 000000000000..ca923ff2bef9 +#endif /* _INTEL_THC_DMA_H_ */ diff --git a/drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h new file mode 100644 -index 000000000000..6729c4c25dab +index 0000000000000..6729c4c25dabc --- /dev/null +++ b/drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h @@ -0,0 +1,881 @@ @@ -8721,7 +8719,7 @@ index 000000000000..6729c4c25dab + +#endif /* _INTEL_THC_HW_H_ */ diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index dd8c74f893db..f2d1fb1b7645 100644 +index dd8c74f893dbd..f2d1fb1b76454 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -10,6 +10,7 @@ @@ -8772,7 +8770,7 @@ index dd8c74f893db..f2d1fb1b7645 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index 2168b6cd7167..5d7cda175a0c 100644 +index 2168b6cd71673..5d7cda175a0ce 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -8964,7 +8962,7 @@ index 2168b6cd7167..5d7cda175a0c 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 599030e1e890..74dd17d516c0 100644 +index 599030e1e890b..74dd17d516c0b 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -9004,7 +9002,7 @@ index 599030e1e890..74dd17d516c0 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/media/i2c/ov08x40.c b/drivers/media/i2c/ov08x40.c -index b9682264e2f5..c2a399e3bb41 100644 +index b9682264e2f53..c2a399e3bb414 100644 --- a/drivers/media/i2c/ov08x40.c +++ b/drivers/media/i2c/ov08x40.c @@ -1322,9 +1322,6 @@ static int ov08x40_power_on(struct device *dev) @@ -9301,7 +9299,7 @@ index b9682264e2f5..c2a399e3bb41 100644 .probe = ov08x40_probe, .remove = ov08x40_remove, diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c -index 35d349fee769..7be1649b1972 100644 +index 35d349fee7698..7be1649b19725 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -502,7 +502,7 @@ static int vsc_tp_probe(struct spi_device *spi) @@ -9314,7 +9312,7 @@ index 35d349fee769..7be1649b1972 100644 return PTR_ERR(tp->wakeuphost); diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 46e04b30f642..063ffbe57ba9 100644 +index 46e04b30f6425..063ffbe57ba94 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -276,6 +276,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -9384,7 +9382,7 @@ index 46e04b30f642..063ffbe57ba9 100644 #ifdef CONFIG_NVME_HOST_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index a85d190942bd..b974ea81b62c 100644 +index a85d190942bdf..b974ea81b62cb 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -9431,7 +9429,7 @@ index a85d190942bd..b974ea81b62c 100644 /* initialize this in the identify path to cover controller resets */ diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index c4bb8dfe1a45..a17435a61ed3 100644 +index c4bb8dfe1a458..a17435a61ed33 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -953,6 +953,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -9453,7 +9451,7 @@ index c4bb8dfe1a45..a17435a61ed3 100644 { } diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 0a1f668999ce..8aba731f9ce3 100644 +index 0a1f668999cef..8aba731f9ce32 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4451,6 +4451,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -9488,7 +9486,7 @@ index 0a1f668999ce..8aba731f9ce3 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index af62a8ed8620..bf275aac44e1 100644 +index af62a8ed86200..bf275aac44e19 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = { @@ -9516,7 +9514,7 @@ index af62a8ed8620..bf275aac44e1 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 906daf423cb0..5e69805e1016 100644 +index 906daf423cb02..5e69805e10162 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5856,6 +5856,13 @@ static void hub_event(struct work_struct *work) @@ -9533,57 +9531,8 @@ index 906daf423cb0..5e69805e1016 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 27ccae63495d..9ce6d1c6cac1 100644 ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -836,6 +836,12 @@ static int fuse_check_folio(struct folio *folio) - return 0; - } - -+/* -+ * Attempt to steal a page from the splice() pipe and move it into the -+ * pagecache. If successful, the pointer in @pagep will be updated. The -+ * folio that was originally in @pagep will lose a reference and the new -+ * folio returned in @pagep will carry a reference. -+ */ - static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) - { - int err; -diff --git a/fs/fuse/file.c b/fs/fuse/file.c -index 7d92a5479998..d63e56fd3dd2 100644 ---- a/fs/fuse/file.c -+++ b/fs/fuse/file.c -@@ -955,8 +955,10 @@ static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args, - fuse_invalidate_atime(inode); - } - -- for (i = 0; i < ap->num_folios; i++) -+ for (i = 0; i < ap->num_folios; i++) { - folio_end_read(ap->folios[i], !err); -+ folio_put(ap->folios[i]); -+ } - if (ia->ff) - fuse_file_put(ia->ff, false); - -@@ -1048,7 +1050,14 @@ static void fuse_readahead(struct readahead_control *rac) - ap = &ia->ap; - - while (ap->num_folios < cur_pages) { -- folio = readahead_folio(rac); -+ /* -+ * This returns a folio with a ref held on it. -+ * The ref needs to be held until the request is -+ * completed, since the splice case (see -+ * fuse_try_move_page()) drops the ref after it's -+ * replaced in the page cache. -+ */ -+ folio = __readahead_folio(rac); - ap->folios[ap->num_folios] = folio; - ap->descs[ap->num_folios].length = folio_size(folio); - ap->num_folios++; diff --git a/include/linux/crypto.h b/include/linux/crypto.h -index b164da5e129e..72bfb79b491d 100644 +index b164da5e129e8..72bfb79b491da 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -134,6 +134,8 @@ @@ -9596,7 +9545,7 @@ index b164da5e129e..72bfb79b491d 100644 * Miscellaneous stuff. */ diff --git a/include/linux/efi.h b/include/linux/efi.h -index 8bcd629ee250..a7f3e750f2fc 100644 +index 8bcd629ee250d..a7f3e750f2fcb 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -9665,7 +9614,7 @@ index 8bcd629ee250..a7f3e750f2fc 100644 { diff --git a/include/linux/hid-over-i2c.h b/include/linux/hid-over-i2c.h new file mode 100644 -index 000000000000..3b1a0208a6b8 +index 0000000000000..3b1a0208a6b84 --- /dev/null +++ b/include/linux/hid-over-i2c.h @@ -0,0 +1,117 @@ @@ -9788,7 +9737,7 @@ index 000000000000..3b1a0208a6b8 +#endif /* _HID_OVER_I2C_H_ */ diff --git a/include/linux/hid-over-spi.h b/include/linux/hid-over-spi.h new file mode 100644 -index 000000000000..da5a14b5e89b +index 0000000000000..da5a14b5e89ba --- /dev/null +++ b/include/linux/hid-over-spi.h @@ -0,0 +1,155 @@ @@ -9948,7 +9897,7 @@ index 000000000000..da5a14b5e89b + +#endif /* _HID_OVER_SPI_H_ */ diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index eb2937599cb0..1368e5927ccc 100644 +index eb2937599cb02..1368e5927ccc3 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -445,6 +445,7 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -9961,7 +9910,7 @@ index eb2937599cb0..1368e5927ccc 100644 LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h new file mode 100644 -index 000000000000..5139cb2cabdc +index 0000000000000..5139cb2cabdc0 --- /dev/null +++ b/include/linux/rh_kabi.h @@ -0,0 +1,541 @@ @@ -10507,7 +10456,7 @@ index 000000000000..5139cb2cabdc + +#endif /* _LINUX_RH_KABI_H */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index ab7eea01ab42..fff7c5f737fc 100644 +index ab7eea01ab427..fff7c5f737fc8 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -10519,7 +10468,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index cbdba435b798..75bb1ac940ec 100644 +index cbdba435b7986..75bb1ac940ec0 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2375,4 +2375,13 @@ static inline void security_initramfs_populated(void) @@ -10537,7 +10486,7 @@ index cbdba435b798..75bb1ac940ec 100644 + #endif /* ! __LINUX_SECURITY_H */ diff --git a/kernel/module/signing.c b/kernel/module/signing.c -index a2ff4242e623..f0d2be1ee4f1 100644 +index a2ff4242e623d..f0d2be1ee4f1c 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) @@ -10560,7 +10509,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/tags.sh b/scripts/tags.sh -index b21236377998..f2f257bc1bfd 100755 +index b212363779980..f2f257bc1bfda 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi @@ -10573,7 +10522,7 @@ index b21236377998..f2f257bc1bfd 100755 # ignore arbitrary directories if [ -n "${IGNORE_DIRS}" ]; then diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index d1fdd113450a..182e8090cfe8 100644 +index d1fdd113450a6..182e8090cfe85 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, @@ -10597,7 +10546,7 @@ index d1fdd113450a..182e8090cfe8 100644 } diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf484010..d0501353a4b9 100644 +index e84ddf4840101..d0501353a4b95 100644 --- a/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -10621,7 +10570,7 @@ index e84ddf484010..d0501353a4b9 100644 prompt "Kernel default lockdown mode" default LOCK_DOWN_KERNEL_FORCE_NONE diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c -index f2bdbd55aa2b..b37a79c4a6af 100644 +index f2bdbd55aa2bc..b37a79c4a6af7 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -72,6 +72,17 @@ static int lockdown_is_locked_down(enum lockdown_reason what) diff --git a/sources b/sources index 6233b7819..ba08d43bb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13.5.tar.xz) = 8843d59f85a5943aefe45298587f89acae45020cbccd1de33054d6177462150bb17239be0b5bba6672d7c75ec617f81b2cec62230035f09c95bfb1a630027d4e -SHA512 (kernel-abi-stablelists-6.13.5.tar.xz) = dbf6ace029d8c93a6c5cb0787f258c5ab13cc21fad60ab8733bb2b53dcfa4c07aea695089b33307897622857d124fc480034980c54265a0870eb1531113fc512 -SHA512 (kernel-kabi-dw-6.13.5.tar.xz) = b5aa1914e0c27f604027114aa727d135185c7d254bb8a5bc5d3d4bfc5777b03748adf3e9bfefdece5d8ad913215c2f79c64f97207e411e4e359de4e41abb8a2f +SHA512 (linux-6.13.6.tar.xz) = 2290e45305ff3f022da435081af4a568cb1fb3f8d37696318f93ce9adc198afc9a40ef310021eeb9912e21db63e3968681b2ca67caa0b5cf329887fb19f6e942 +SHA512 (kernel-abi-stablelists-6.13.6.tar.xz) = 92c1fd5b1c415f1cd576caba8353024bea2b1f431873594a9aa474abc7771e9058c790c37bf65e6f72fc1c7ac9241fbba16877df2f3cffaa554f838c0565e730 +SHA512 (kernel-kabi-dw-6.13.6.tar.xz) = 024cbd41540195018dbc5eabb1bf53fef8584a69c176a143b01bc5ee2650ac151263a417d227535a3ddb908d54a615d4b19ae9892fb3d57e3f482f71f195ac64