From 8082dfeacaf81205cf469e4f5a8277701e3556fe Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 29 Oct 2024 05:12:06 +0300 Subject: [PATCH] refresh Debian patches --- ...c-Fix-IDMAC-operation-with-pages-big.patch | 7 +----- ...pupower-fix-checks-for-cpu-existence.patch | 2 +- ...ftdep-declarations-for-hard-coded-cr.patch | 6 ++--- ...efine-_fortify_source-as-2-not-empty.patch | 2 +- ...s-fix-typo-causing-some-targets-not-.patch | 15 +++---------- ...ove-bpf-run-time-check-at-build-time.patch | 2 +- ...ix-missing-ldflags-for-some-programs.patch | 2 +- ...ortify_source_2_for_non_debug_builds.patch | 4 ---- .../all/usbip-document-tcp-wrappers.patch | 2 +- ...rkwood-fix-sata-pinmux-ing-for-ts419.patch | 2 +- ...__sync_icache_dcache-for-xen-privcmd.patch | 8 +++---- ...2poly.h-when-building-with-kernel_xz.patch | 8 +++---- ...use-hyphen-in-exported-variable-name.patch | 22 +++++++------------ .../perf-tools-fix-unwind-build-on-i386.patch | 4 ++-- ...d-fix-libunwind-feature-detection-on.patch | 2 +- .../viafb-autoload-on-olpc-xo1.5-only.patch | 2 +- ...nprivileged-CLONE_NEWUSER-by-default.patch | 4 ++-- ...e-auto-loading-as-mitigation-against.patch | 2 +- .../debian/arch-sh4-fix-uimage-build.patch | 7 +----- ...-raid5-6-being-experimental-at-mount.patch | 10 ++++----- .../cdc_ncm-cdc_mbim-use-ncm-by-default.patch | 2 +- ...as-mitigation-against-local-exploits.patch | 4 ++-- ...-powerpc-platforms-8xx-ucode-disable.patch | 4 +--- ...ers-media-dvb-dvb-usb-af9005-disable.patch | 2 +- .../video-remove-nvidiafb-and-rivafb.patch | 2 +- ...rt-symbols-needed-by-android-drivers.patch | 10 ++++----- ...n-use-of-fanotify_access_permissions.patch | 2 +- .../debian/fjes-disable-autoload.patch | 8 +++---- ...ink-security-restrictions-by-default.patch | 2 +- debian/patches/debian/gitignore.patch | 2 +- ...as-mitigation-against-local-exploits.patch | 6 ++--- ...i-do-not-request-unreleased-firmware.patch | 2 +- .../kbuild-abort-build-if-subdirs-used.patch | 2 +- ...-module.lds-under-arch-directory-too.patch | 8 ++----- debian/patches/debian/kernelvariables.patch | 4 ++-- ...ing-source-filenames-from-executable.patch | 2 +- ...compiler-version-comparison-optional.patch | 2 +- ...support-asciidoctor-for-documentatio.patch | 9 +------- ...-loading-as-mitigation-against-local.patch | 7 +----- .../tools-perf-install-python-bindings.patch | 7 +----- ...tools-perf-perf-read-vdso-in-libexec.patch | 2 +- .../debian/uname-version-timestamp.patch | 6 ++--- ...d-debian-wireless-regdb-certificates.patch | 6 ----- .../debian/yama-disable-by-default.patch | 4 +--- ...-hash-before-loading-a-kernel-module.patch | 6 ++--- .../trust-machine-keyring-by-default.patch | 2 -- ...edia-dvb-usb-af9005-request_firmware.patch | 14 +++++------- ...rnel-config-option-to-lock-down-when.patch | 18 +++++++-------- ...ecure_boot-flag-to-indicate-secure-b.patch | 12 +++++----- ...e-kernel-if-booted-in-secure-boot-mo.patch | 8 +++---- ...ig-option-to-exclude-igpu-by-default.patch | 4 ++-- ...ption-to-exclude-integrated-gpu-only.patch | 12 +++++----- ...make-x32-syscall-support-conditional.patch | 8 +++---- .../x86-memtest-WARN-if-bad-RAM-found.patch | 2 +- 54 files changed, 114 insertions(+), 190 deletions(-) diff --git a/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch b/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch index 4afd8eb..61674be 100644 --- a/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch +++ b/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch @@ -9,11 +9,9 @@ This reverts commit 8396c793ffdf28bb8aee7cfe0891080f8cab7890. drivers/mmc/host/dw_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c -index 41e451235f637..e9f6e4e622901 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c -@@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mci *host) +@@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mc if (host->use_dma == TRANS_MODE_IDMAC) { mmc->max_segs = host->ring_size; mmc->max_blk_size = 65535; @@ -24,6 +22,3 @@ index 41e451235f637..e9f6e4e622901 100644 mmc->max_blk_count = mmc->max_req_size / 512; } else if (host->use_dma == TRANS_MODE_EDMAC) { mmc->max_segs = 64; --- -2.45.2 - diff --git a/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch b/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch index d8352b8..c9404db 100644 --- a/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch +++ b/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch @@ -24,7 +24,7 @@ negative cases.] --- --- a/tools/power/cpupower/bench/system.c +++ b/tools/power/cpupower/bench/system.c -@@ -58,12 +58,19 @@ long long int get_time() +@@ -45,12 +45,19 @@ long long int get_time() int set_cpufreq_governor(char *governor, unsigned int cpu) { diff --git a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch index 7336dbb..7979c53 100644 --- a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch +++ b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch @@ -18,7 +18,7 @@ Signed-off-by: Ben Hutchings --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -2619,7 +2619,7 @@ module_exit(exit_btrfs_fs) +@@ -2638,7 +2638,7 @@ module_exit(exit_btrfs_fs) MODULE_DESCRIPTION("B-Tree File System (BTRFS)"); MODULE_LICENSE("GPL"); @@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings MODULE_SOFTDEP("pre: blake2b-256"); --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -7404,6 +7404,6 @@ static void __exit ext4_exit_fs(void) +@@ -7435,6 +7435,6 @@ static void __exit ext4_exit_fs(void) MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Fourth Extended Filesystem"); MODULE_LICENSE("GPL"); @@ -49,7 +49,7 @@ Signed-off-by: Ben Hutchings --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c -@@ -2353,5 +2353,8 @@ static void __exit exit_nfsd(void) +@@ -2352,5 +2352,8 @@ static void __exit exit_nfsd(void) MODULE_AUTHOR("Olaf Kirch "); MODULE_DESCRIPTION("In-kernel NFS server"); MODULE_LICENSE("GPL"); diff --git a/debian/patches/bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch b/debian/patches/bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch index 0412b83..add06fb 100644 --- a/debian/patches/bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch +++ b/debian/patches/bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch @@ -7,7 +7,7 @@ Signed-off-by: Ben Hutchings --- --- a/tools/lib/api/Makefile +++ b/tools/lib/api/Makefile -@@ -29,7 +29,7 @@ endif +@@ -39,7 +39,7 @@ endif endif ifeq ($(DEBUG),0) diff --git a/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch b/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch index 470df89..b5528ee 100644 --- a/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch +++ b/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch @@ -27,11 +27,9 @@ Signed-off-by: Pablo Neira Ayuso net/netfilter/xt_mark.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c -index d80abd6ccaf8..6dcf4bc7e30b 100644 --- a/net/netfilter/xt_NFLOG.c +++ b/net/netfilter/xt_NFLOG.c -@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = { +@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] _ { .name = "NFLOG", .revision = 0, @@ -40,11 +38,9 @@ index d80abd6ccaf8..6dcf4bc7e30b 100644 .checkentry = nflog_tg_check, .destroy = nflog_tg_destroy, .target = nflog_tg, -diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c -index f3fa4f11348c..a642ff09fc8e 100644 --- a/net/netfilter/xt_TRACE.c +++ b/net/netfilter/xt_TRACE.c -@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = { +@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] _ .target = trace_tg, .checkentry = trace_tg_check, .destroy = trace_tg_destroy, @@ -52,11 +48,9 @@ index f3fa4f11348c..a642ff09fc8e 100644 }, #endif }; -diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c -index f76fe04fc9a4..65b965ca40ea 100644 --- a/net/netfilter/xt_mark.c +++ b/net/netfilter/xt_mark.c -@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = { +@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __ { .name = "MARK", .revision = 2, @@ -65,6 +59,3 @@ index f76fe04fc9a4..65b965ca40ea 100644 .target = mark_tg, .targetsize = sizeof(struct xt_mark_tginfo2), .me = THIS_MODULE, --- -2.45.2 - diff --git a/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch b/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch index 3818dbb..3c5e7e7 100644 --- a/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch +++ b/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch @@ -11,7 +11,7 @@ Signed-off-by: Ben Hutchings --- --- a/tools/build/feature/test-bpf.c +++ b/tools/build/feature/test-bpf.c -@@ -35,8 +35,10 @@ int main(void) +@@ -41,8 +41,10 @@ int main(void) attr.prog_flags = 0; /* diff --git a/debian/patches/bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch b/debian/patches/bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch index 2d8f29d..a39f5db 100644 --- a/debian/patches/bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch +++ b/debian/patches/bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch @@ -6,7 +6,7 @@ Signed-off-by: Ben Hutchings --- --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf -@@ -785,7 +785,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in +@@ -925,7 +925,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in .SECONDARY: $(DLFILTERS:.so=.o) $(OUTPUT)dlfilters/%.so: $(OUTPUT)dlfilters/%.o diff --git a/debian/patches/bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch b/debian/patches/bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch index 9662520..94a5584 100644 --- a/debian/patches/bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch +++ b/debian/patches/bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch @@ -14,8 +14,6 @@ Acked-by: Ian Rogers tools/lib/symbol/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tools/lib/symbol/Makefile b/tools/lib/symbol/Makefile -index 13d43c6f92b4..4a08cc4e19f2 100644 --- a/tools/lib/symbol/Makefile +++ b/tools/lib/symbol/Makefile @@ -39,7 +39,7 @@ endif @@ -27,5 +25,3 @@ index 13d43c6f92b4..4a08cc4e19f2 100644 endif # Treat warnings as errors unless directed not to --- -2.39.2 diff --git a/debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch b/debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch index d9d7b30..efb493f 100644 --- a/debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch +++ b/debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch @@ -17,7 +17,7 @@ Add references to TCP wrappers configuration in the manual page. .SH OPTIONS .HP -@@ -69,7 +70,8 @@ Show version. +@@ -75,7 +76,8 @@ Show version. .B usbipd offers no authentication or authorization for USB/IP. Any diff --git a/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch b/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch index 52acb9f..a113627 100644 --- a/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch +++ b/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch @@ -21,7 +21,7 @@ Signed-off-by: Ben Hutchings --- a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi -@@ -69,3 +69,11 @@ +@@ -67,3 +67,11 @@ phy-handle = <ðphy1>; }; }; diff --git a/debian/patches/bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch b/debian/patches/bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch index cd5b36f..a3a198c 100644 --- a/debian/patches/bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch +++ b/debian/patches/bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch @@ -17,11 +17,9 @@ Signed-off-by: Ben Hutchings arch/arm/mm/flush.c | 1 + 1 file changed, 1 insertion(+) -Index: debian-kernel/arch/arm/mm/flush.c -=================================================================== ---- debian-kernel.orig/arch/arm/mm/flush.c -+++ debian-kernel/arch/arm/mm/flush.c -@@ -292,6 +292,7 @@ void __sync_icache_dcache(pte_t pteval) +--- a/arch/arm/mm/flush.c ++++ b/arch/arm/mm/flush.c +@@ -310,6 +310,7 @@ void __sync_icache_dcache(pte_t pteval) if (pte_exec(pteval)) __flush_icache_all(); } diff --git a/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch b/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch index a00a2a4..5581261 100644 --- a/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch +++ b/debian/patches/bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch @@ -24,11 +24,9 @@ Tested-by: Michal Kubecek arch/powerpc/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux/arch/powerpc/boot/Makefile -=================================================================== ---- linux.orig/arch/powerpc/boot/Makefile -+++ linux/arch/powerpc/boot/Makefile -@@ -70,7 +70,7 @@ BOOTCFLAGS += -fno-stack-protector +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -97,7 +97,7 @@ BOOTCFLAGS += -fno-stack-protector endif BOOTCFLAGS += -include $(srctree)/include/linux/compiler_attributes.h diff --git a/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch b/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch index 31eb2eb..9a30440 100644 --- a/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch +++ b/debian/patches/bugfix/sh/sh-boot-do-not-use-hyphen-in-exported-variable-name.patch @@ -23,10 +23,8 @@ Signed-off-by: Ben Hutchings arch/sh/boot/romimage/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) -Index: linux/arch/sh/Makefile -=================================================================== ---- linux.orig/arch/sh/Makefile -+++ linux/arch/sh/Makefile +--- a/arch/sh/Makefile ++++ b/arch/sh/Makefile @@ -102,16 +102,16 @@ UTS_MACHINE := sh LDFLAGS_vmlinux += -e _stext @@ -49,11 +47,9 @@ Index: linux/arch/sh/Makefile # Mach groups machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se -Index: linux/arch/sh/boot/compressed/Makefile -=================================================================== ---- linux.orig/arch/sh/boot/compressed/Makefile -+++ linux/arch/sh/boot/compressed/Makefile -@@ -36,7 +36,7 @@ endif +--- a/arch/sh/boot/compressed/Makefile ++++ b/arch/sh/boot/compressed/Makefile +@@ -27,7 +27,7 @@ endif ccflags-remove-$(CONFIG_MCOUNT) += -pg @@ -62,7 +58,7 @@ Index: linux/arch/sh/boot/compressed/Makefile -T $(obj)/../../kernel/vmlinux.lds KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -@@ -60,7 +60,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.b +@@ -51,7 +51,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.b OBJCOPYFLAGS += -R .empty_zero_page @@ -71,10 +67,8 @@ Index: linux/arch/sh/boot/compressed/Makefile $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE $(call if_changed,ld) -Index: linux/arch/sh/boot/romimage/Makefile -=================================================================== ---- linux.orig/arch/sh/boot/romimage/Makefile -+++ linux/arch/sh/boot/romimage/Makefile +--- a/arch/sh/boot/romimage/Makefile ++++ b/arch/sh/boot/romimage/Makefile @@ -13,7 +13,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724) : load-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-load-y) obj-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-obj-y) diff --git a/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch b/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch index f9baa7b..07410f8 100644 --- a/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch +++ b/debian/patches/bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch @@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings --- a/tools/perf/arch/x86/util/unwind-libunwind.c +++ b/tools/perf/arch/x86/util/unwind-libunwind.c -@@ -66,7 +66,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum) +@@ -67,7 +67,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum) break; default: pr_err("unwind: invalid reg id %d\n", regnum); @@ -24,7 +24,7 @@ Signed-off-by: Ben Hutchings } return id; -@@ -106,7 +106,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum) +@@ -107,7 +107,7 @@ int LIBUNWIND__ARCH_REG_ID(int regnum) break; default: pr_err("unwind: invalid reg id %d\n", regnum); diff --git a/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch b/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch index e962b04..414df10 100644 --- a/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch +++ b/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch @@ -11,7 +11,7 @@ It broke feature detection that was working just fine for us. --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config -@@ -38,7 +38,7 @@ ifeq ($(SRCARCH),x86) +@@ -61,7 +61,7 @@ ifeq ($(SRCARCH),x86) LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma $(call detected,CONFIG_X86_64) else diff --git a/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch b/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch index 62b4eb7..a30414d 100644 --- a/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch +++ b/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch @@ -16,7 +16,7 @@ un-blacklist it in udev. --- --- a/drivers/video/fbdev/via/via-core.c +++ b/drivers/video/fbdev/via/via-core.c -@@ -695,7 +695,14 @@ static const struct pci_device_id via_pc +@@ -700,7 +700,14 @@ static const struct pci_device_id via_pc .driver_data = UNICHROME_VX900 }, { } }; diff --git a/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch b/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch index df5268c..1f74518 100644 --- a/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch +++ b/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch @@ -34,7 +34,7 @@ Signed-off-by: Serge Hallyn /* * Minimum number of threads to boot the kernel */ -@@ -2138,6 +2144,10 @@ __latent_entropy struct task_struct *cop +@@ -2135,6 +2141,10 @@ __latent_entropy struct task_struct *cop if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -45,7 +45,7 @@ Signed-off-by: Serge Hallyn /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3287,6 +3297,12 @@ int ksys_unshare(unsigned long unshare_f +@@ -3283,6 +3293,12 @@ int ksys_unshare(unsigned long unshare_f if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; diff --git a/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch b/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch index 7c530cb..73bf91e 100644 --- a/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch +++ b/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch @@ -21,7 +21,7 @@ Signed-off-by: Ben Hutchings --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c -@@ -1138,4 +1138,4 @@ module_init(af_ieee802154_init); +@@ -1138,4 +1138,4 @@ module_exit(af_ieee802154_remove); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("IEEE 802.15.4 socket interface"); diff --git a/debian/patches/debian/arch-sh4-fix-uimage-build.patch b/debian/patches/debian/arch-sh4-fix-uimage-build.patch index 89e626b..3c7200d 100644 --- a/debian/patches/debian/arch-sh4-fix-uimage-build.patch +++ b/debian/patches/debian/arch-sh4-fix-uimage-build.patch @@ -9,11 +9,9 @@ Forwarded: not-needed arch/sh/Makefile | 1 - 1 file changed, 1 deletion(-) -diff --git a/arch/sh/Makefile b/arch/sh/Makefile -index da9cf952f33c..974bbd9dcfcf 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile -@@ -85,7 +85,6 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \ +@@ -81,7 +81,6 @@ OBJCOPYFLAGS := -O binary -R .note -R .n # Give the various platforms the opportunity to set default image types defaultimage-y := zImage @@ -21,6 +19,3 @@ index da9cf952f33c..974bbd9dcfcf 100644 defaultimage-$(CONFIG_SH_RSK) := uImage defaultimage-$(CONFIG_SH_URQUELL) := uImage defaultimage-$(CONFIG_SH_MIGOR) := uImage --- -2.27.0 - diff --git a/debian/patches/debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch b/debian/patches/debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch index a9a3ce9..69c6796 100644 --- a/debian/patches/debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch +++ b/debian/patches/debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch @@ -20,15 +20,12 @@ implementation went from disk-io.c to super.c; forwarded the issue] fs/btrfs/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c -index 101f786963d4..2c409bce1bf5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -731,6 +731,18 @@ static void set_device_specific_options(struct btrfs_fs_info *fs_info) - !fs_info->fs_devices->rotating) +@@ -757,6 +757,18 @@ static void set_device_specific_options( btrfs_set_opt(fs_info->mount_opt, SSD); -+ /* + /* + * Warn about RAID5/6 being experimental at mount time + */ + if ((fs_info->avail_data_alloc_bits | @@ -40,6 +37,7 @@ index 101f786963d4..2c409bce1bf5 100644 + add_taint(TAINT_AUX, LOCKDEP_STILL_OK); + } + - /* ++ /* * For devices supporting discard turn on discard=async automatically, * unless it's already set or disabled. This could be turned off by + * nodiscard for the same mount. diff --git a/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch b/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch index 70b4468..21fcca4 100644 --- a/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch +++ b/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch @@ -13,7 +13,7 @@ once it's ready to speak MBIM. --- --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c -@@ -53,11 +53,7 @@ +@@ -54,11 +54,7 @@ #include #include diff --git a/debian/patches/debian/dccp-disable-auto-loading-as-mitigation-against-local-exploits.patch b/debian/patches/debian/dccp-disable-auto-loading-as-mitigation-against-local-exploits.patch index 8358318..dccd6d1 100644 --- a/debian/patches/debian/dccp-disable-auto-loading-as-mitigation-against-local-exploits.patch +++ b/debian/patches/debian/dccp-disable-auto-loading-as-mitigation-against-local-exploits.patch @@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings --- --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c -@@ -1071,8 +1071,8 @@ module_exit(dccp_v4_exit); +@@ -1098,8 +1098,8 @@ module_exit(dccp_v4_exit); * values directly, Also cover the case where the protocol is not specified, * i.e. net-pf-PF_INET-proto-0-type-SOCK_DCCP */ @@ -28,7 +28,7 @@ Signed-off-by: Ben Hutchings MODULE_DESCRIPTION("DCCP - Datagram Congestion Controlled Protocol"); --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c -@@ -1125,8 +1125,8 @@ module_exit(dccp_v6_exit); +@@ -1174,8 +1174,8 @@ module_exit(dccp_v6_exit); * values directly, Also cover the case where the protocol is not specified, * i.e. net-pf-PF_INET6-proto-0-type-SOCK_DCCP */ diff --git a/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch b/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch index 0e51769..b9dca1d 100644 --- a/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch +++ b/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch @@ -3,11 +3,9 @@ Date: Mon, 13 Apr 2009 17:34:00 +0100 Subject: Remove microcode patches for mgsuvd (not enabled in Debian configs) Forwarded: not-needed -diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig -index 48a920a..81570b6 100644 --- a/arch/powerpc/platforms/8xx/Kconfig +++ b/arch/powerpc/platforms/8xx/Kconfig -@@ -160,16 +160,19 @@ config NO_UCODE_PATCH +@@ -136,16 +136,19 @@ config NO_UCODE_PATCH config USB_SOF_UCODE_PATCH bool "USB SOF patch" diff --git a/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch b/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch index 4e42da9..1cc5a29 100644 --- a/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch +++ b/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/drivers/media/usb/dvb-usb/Kconfig +++ b/drivers/media/usb/dvb-usb/Kconfig -@@ -227,6 +227,7 @@ config DVB_USB_OPERA1 +@@ -35,6 +35,7 @@ config DVB_USB_A800 config DVB_USB_AF9005 tristate "Afatech AF9005 DVB-T USB1.1 support" diff --git a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch index 8c6ae9a..de463d6 100644 --- a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch +++ b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch @@ -15,7 +15,7 @@ probably discontinued 10 years ago. --- --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig -@@ -654,100 +654,6 @@ config FB_ATMEL +@@ -657,100 +657,6 @@ config FB_ATMEL help This enables support for the AT91 LCD Controller. diff --git a/debian/patches/debian/export-symbols-needed-by-android-drivers.patch b/debian/patches/debian/export-symbols-needed-by-android-drivers.patch index 8887113..ad72fc9 100644 --- a/debian/patches/debian/export-symbols-needed-by-android-drivers.patch +++ b/debian/patches/debian/export-symbols-needed-by-android-drivers.patch @@ -22,7 +22,7 @@ Export the currently un-exported symbols it depends on. --- a/fs/file.c +++ b/fs/file.c -@@ -823,6 +823,7 @@ struct file *file_close_fd(unsigned int +@@ -792,6 +792,7 @@ struct file *file_close_fd(unsigned int return file; } @@ -92,7 +92,7 @@ Export the currently un-exported symbols it depends on. * zap_vma_ptes - remove ptes mapping the vma --- a/security/security.c +++ b/security/security.c -@@ -890,6 +890,7 @@ int security_binder_set_context_mgr(cons +@@ -893,6 +893,7 @@ int security_binder_set_context_mgr(cons { return call_int_hook(binder_set_context_mgr, mgr); } @@ -100,7 +100,7 @@ Export the currently un-exported symbols it depends on. /** * security_binder_transaction() - Check if a binder transaction is allowed -@@ -905,6 +906,7 @@ int security_binder_transaction(const st +@@ -908,6 +909,7 @@ int security_binder_transaction(const st { return call_int_hook(binder_transaction, from, to); } @@ -108,7 +108,7 @@ Export the currently un-exported symbols it depends on. /** * security_binder_transfer_binder() - Check if a binder transfer is allowed -@@ -920,6 +922,7 @@ int security_binder_transfer_binder(cons +@@ -923,6 +925,7 @@ int security_binder_transfer_binder(cons { return call_int_hook(binder_transfer_binder, from, to); } @@ -116,7 +116,7 @@ Export the currently un-exported symbols it depends on. /** * security_binder_transfer_file() - Check if a binder file xfer is allowed -@@ -936,6 +939,7 @@ int security_binder_transfer_file(const +@@ -939,6 +942,7 @@ int security_binder_transfer_file(const { return call_int_hook(binder_transfer_file, from, to, file); } diff --git a/debian/patches/debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch b/debian/patches/debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch index 88a2b15..7150da4 100644 --- a/debian/patches/debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch +++ b/debian/patches/debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch @@ -12,7 +12,7 @@ actually used. --- --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c -@@ -1661,6 +1661,14 @@ static int do_fanotify_mark(int fanotify +@@ -1752,6 +1752,14 @@ static int do_fanotify_mark(int fanotify umask = FANOTIFY_EVENT_FLAGS; } diff --git a/debian/patches/debian/fjes-disable-autoload.patch b/debian/patches/debian/fjes-disable-autoload.patch index 873c690..1f18e37 100644 --- a/debian/patches/debian/fjes-disable-autoload.patch +++ b/debian/patches/debian/fjes-disable-autoload.patch @@ -11,11 +11,9 @@ all the other systems where the same device ID appears, so disable auto-loading. --- -Index: linux/drivers/net/fjes/fjes_main.c -=================================================================== ---- linux.orig/drivers/net/fjes/fjes_main.c -+++ linux/drivers/net/fjes/fjes_main.c -@@ -36,7 +36,7 @@ static const struct acpi_device_id fjes_ +--- a/drivers/net/fjes/fjes_main.c ++++ b/drivers/net/fjes/fjes_main.c +@@ -34,7 +34,7 @@ static const struct acpi_device_id fjes_ {ACPI_MOTHERBOARD_RESOURCE_HID, 0}, {"", 0}, }; diff --git a/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch b/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch index eab0e78..b11e2c0 100644 --- a/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch +++ b/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch @@ -9,7 +9,7 @@ This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1020,8 +1020,8 @@ static inline void put_link(struct namei +@@ -1034,8 +1034,8 @@ static inline void put_link(struct namei path_put(&last->link); } diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch index 94a425e..7d46715 100644 --- a/debian/patches/debian/gitignore.patch +++ b/debian/patches/debian/gitignore.patch @@ -42,7 +42,7 @@ Forwarded: not-needed # Generated include files # /include/config/ -@@ -177,3 +159,10 @@ sphinx_*/ +@@ -176,3 +158,10 @@ sphinx_*/ # Rust analyzer configuration /rust-project.json diff --git a/debian/patches/debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch b/debian/patches/debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch index b532d00..2a32ce2 100644 --- a/debian/patches/debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch +++ b/debian/patches/debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch @@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings --- --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c -@@ -1986,7 +1986,7 @@ module_init(ax25_init); +@@ -2066,7 +2066,7 @@ module_init(ax25_init); MODULE_AUTHOR("Jonathan Naylor G4KLX "); MODULE_DESCRIPTION("The amateur radio AX.25 link layer protocol"); MODULE_LICENSE("GPL"); @@ -26,7 +26,7 @@ Signed-off-by: Ben Hutchings { --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c -@@ -1486,7 +1486,7 @@ MODULE_PARM_DESC(nr_ndevs, "number of NE +@@ -1498,7 +1498,7 @@ MODULE_PARM_DESC(nr_ndevs, "number of NE MODULE_AUTHOR("Jonathan Naylor G4KLX "); MODULE_DESCRIPTION("The amateur radio NET/ROM network and transport layer protocol"); MODULE_LICENSE("GPL"); @@ -37,7 +37,7 @@ Signed-off-by: Ben Hutchings { --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c -@@ -1577,7 +1577,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of +@@ -1630,7 +1630,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of MODULE_AUTHOR("Jonathan Naylor G4KLX "); MODULE_DESCRIPTION("The amateur radio ROSE network layer protocol"); MODULE_LICENSE("GPL"); diff --git a/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch b/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch index c806143..4479cfc 100644 --- a/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch +++ b/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch @@ -15,7 +15,7 @@ requesting the unreleased firmware. --- a/drivers/net/wireless/intel/iwlwifi/cfg/6000.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/6000.c -@@ -31,7 +31,7 @@ +@@ -12,7 +12,7 @@ #include "dvm/commands.h" /* needed for BT for now */ /* Highest firmware API version supported */ diff --git a/debian/patches/debian/kbuild-abort-build-if-subdirs-used.patch b/debian/patches/debian/kbuild-abort-build-if-subdirs-used.patch index ec23040..113d68b 100644 --- a/debian/patches/debian/kbuild-abort-build-if-subdirs-used.patch +++ b/debian/patches/debian/kbuild-abort-build-if-subdirs-used.patch @@ -16,7 +16,7 @@ The error message is based on that used in commit 0126be38d988 --- --- a/Makefile +++ b/Makefile -@@ -218,6 +218,18 @@ ifeq ("$(origin M)", "command line") +@@ -134,6 +134,18 @@ ifeq ("$(origin M)", "command line") KBUILD_EXTMOD := $(M) endif diff --git a/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch b/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch index 174199c..d2b9390 100644 --- a/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch +++ b/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch @@ -25,11 +25,9 @@ rules.real and change Makefile.modfinal to look for it in both places. scripts/Makefile.modfinal | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal -index 8568d256d6fb..415cff66539b 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal -@@ -28,11 +28,13 @@ quiet_cmd_cc_o_c = CC [M] $@ +@@ -30,11 +30,13 @@ quiet_cmd_cc_o_c = CC [M] $@ %.mod.o: %.mod.c FORCE $(call if_changed_dep,cc_o_c) @@ -44,7 +42,7 @@ index 8568d256d6fb..415cff66539b 100644 quiet_cmd_btf_ko = BTF [M] $@ cmd_btf_ko = \ -@@ -52,7 +54,7 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \ +@@ -54,7 +56,7 @@ if_changed_except = $(if $(call newer_pr printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) # Re-generate module BTFs if either module's .ko or vmlinux changed @@ -53,5 +51,3 @@ index 8568d256d6fb..415cff66539b 100644 +$(call if_changed_except,ld_ko_o,vmlinux) ifdef CONFIG_DEBUG_INFO_BTF_MODULES +$(if $(newer-prereqs),$(call cmd,btf_ko)) --- -2.42.0 diff --git a/debian/patches/debian/kernelvariables.patch b/debian/patches/debian/kernelvariables.patch index ef427ab..95bb6df 100644 --- a/debian/patches/debian/kernelvariables.patch +++ b/debian/patches/debian/kernelvariables.patch @@ -17,7 +17,7 @@ use of $(ARCH) needs to be moved after this. --- --- a/Makefile +++ b/Makefile -@@ -406,36 +406,6 @@ include $(srctree)/scripts/subarch.inclu +@@ -380,36 +380,6 @@ include $(srctree)/scripts/subarch.inclu # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile ARCH ?= $(SUBARCH) @@ -54,7 +54,7 @@ use of $(ARCH) needs to be moved after this. KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG -@@ -551,6 +521,35 @@ RUSTFLAGS_KERNEL = +@@ -524,6 +494,35 @@ RUSTFLAGS_KERNEL = AFLAGS_KERNEL = LDFLAGS_vmlinux = diff --git a/debian/patches/debian/linux-perf-remove-remaining-source-filenames-from-executable.patch b/debian/patches/debian/linux-perf-remove-remaining-source-filenames-from-executable.patch index effe1d1..b9bc801 100644 --- a/debian/patches/debian/linux-perf-remove-remaining-source-filenames-from-executable.patch +++ b/debian/patches/debian/linux-perf-remove-remaining-source-filenames-from-executable.patch @@ -15,7 +15,7 @@ to the installed location. --- --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c -@@ -654,10 +654,12 @@ static int report__browse_hists(struct r +@@ -655,10 +655,12 @@ static int report__browse_hists(struct r path = system_path(TIPDIR); if (perf_tip(&help, path) || help == NULL) { diff --git a/debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch b/debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch index f0d5c80..e2969b6 100644 --- a/debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch +++ b/debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch @@ -20,7 +20,7 @@ is non-empty. --- --- a/Makefile +++ b/Makefile -@@ -1753,7 +1753,7 @@ PHONY += prepare +@@ -1807,7 +1807,7 @@ PHONY += prepare # now expand this into a simple variable to reduce the cost of shell evaluations prepare: CC_VERSION_TEXT := $(CC_VERSION_TEXT) prepare: diff --git a/debian/patches/debian/perf-traceevent-support-asciidoctor-for-documentatio.patch b/debian/patches/debian/perf-traceevent-support-asciidoctor-for-documentatio.patch index a1cbb2c..4af7427 100644 --- a/debian/patches/debian/perf-traceevent-support-asciidoctor-for-documentatio.patch +++ b/debian/patches/debian/perf-traceevent-support-asciidoctor-for-documentatio.patch @@ -9,8 +9,6 @@ Forwarded: not-needed tools/perf/Documentation/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/lib/perf/Documentation/Makefile b/tools/lib/perf/Documentation/Makefile -index 972754082a85..272d06173a3e 100644 --- a/tools/lib/perf/Documentation/Makefile +++ b/tools/lib/perf/Documentation/Makefile @@ -35,7 +35,7 @@ htmldir = $(docdir)/html @@ -22,11 +20,9 @@ index 972754082a85..272d06173a3e 100644 ASCIIDOC_HTML = xhtml11 MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA = -diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile -index 6e54979c2124..7bfa6ae971ab 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile -@@ -48,7 +48,7 @@ man5dir=$(mandir)/man5 +@@ -45,7 +45,7 @@ man5dir=$(mandir)/man5 man7dir=$(mandir)/man7 ASCIIDOC=asciidoc @@ -35,6 +31,3 @@ index 6e54979c2124..7bfa6ae971ab 100644 ASCIIDOC_HTML = xhtml11 MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA = --- -2.28.0 - diff --git a/debian/patches/debian/rds-Disable-auto-loading-as-mitigation-against-local.patch b/debian/patches/debian/rds-Disable-auto-loading-as-mitigation-against-local.patch index 3343aec..a1fa856 100644 --- a/debian/patches/debian/rds-Disable-auto-loading-as-mitigation-against-local.patch +++ b/debian/patches/debian/rds-Disable-auto-loading-as-mitigation-against-local.patch @@ -19,16 +19,11 @@ Signed-off-by: Ben Hutchings net/rds/af_rds.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c -index 98e0538..d8d4525 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c -@@ -574,4 +574,4 @@ MODULE_DESCRIPTION("RDS: Reliable Datagram Sockets" +@@ -959,4 +959,4 @@ MODULE_DESCRIPTION("RDS: Reliable Datagr " v" DRV_VERSION " (" DRV_RELDATE ")"); MODULE_VERSION(DRV_VERSION); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_ALIAS_NETPROTO(PF_RDS); +/* MODULE_ALIAS_NETPROTO(PF_RDS); */ --- -1.7.2.3 - diff --git a/debian/patches/debian/tools-perf-install-python-bindings.patch b/debian/patches/debian/tools-perf-install-python-bindings.patch index c3f1747..bd00a09 100644 --- a/debian/patches/debian/tools-perf-install-python-bindings.patch +++ b/debian/patches/debian/tools-perf-install-python-bindings.patch @@ -8,11 +8,9 @@ Forwarded: not-needed tools/perf/Makefile.perf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index 80522bcfafe0..b011c7aae742 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf -@@ -1026,7 +1026,7 @@ install-bin: install-tools install-tests install-traceevent-plugins +@@ -1149,7 +1149,7 @@ install-bin: install-tools install-tests install: install-bin try-install-man install-python_ext: @@ -21,6 +19,3 @@ index 80522bcfafe0..b011c7aae742 100644 # 'make install-doc' should call 'make -C Documentation install' $(INSTALL_DOC_TARGETS): --- -2.30.2 - diff --git a/debian/patches/debian/tools-perf-perf-read-vdso-in-libexec.patch b/debian/patches/debian/tools-perf-perf-read-vdso-in-libexec.patch index 044f584..3420f46 100644 --- a/debian/patches/debian/tools-perf-perf-read-vdso-in-libexec.patch +++ b/debian/patches/debian/tools-perf-perf-read-vdso-in-libexec.patch @@ -4,7 +4,7 @@ Subject: linux-tools: Install perf-read-vdso{,x}32 in directory under /usr/lib --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf -@@ -943,21 +943,21 @@ install-tools: all install-gtk +@@ -1073,21 +1073,21 @@ install-tools: all install-gtk $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \ $(INSTALL) -m 644 include/perf/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf' diff --git a/debian/patches/debian/uname-version-timestamp.patch b/debian/patches/debian/uname-version-timestamp.patch index 4be158e..28e8d1d 100644 --- a/debian/patches/debian/uname-version-timestamp.patch +++ b/debian/patches/debian/uname-version-timestamp.patch @@ -11,10 +11,8 @@ kernel image reproducible. Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to $KBUILD_BUILD_TIMESTAMP. -Index: linux/init/Makefile -=================================================================== ---- linux.orig/init/Makefile -+++ linux/init/Makefile +--- a/init/Makefile ++++ b/init/Makefile @@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC) : preempt-flag-$(CONFIG_PREEMPT_RT) := PREEMPT_RT diff --git a/debian/patches/debian/wireless-add-debian-wireless-regdb-certificates.patch b/debian/patches/debian/wireless-add-debian-wireless-regdb-certificates.patch index edbf865..2556635 100644 --- a/debian/patches/debian/wireless-add-debian-wireless-regdb-certificates.patch +++ b/debian/patches/debian/wireless-add-debian-wireless-regdb-certificates.patch @@ -15,9 +15,6 @@ This hex dump is generated using: 1 file changed, 1426 insertions(+) create mode 100644 net/wireless/certs/debian.hex -diff --git a/net/wireless/certs/debian.hex b/net/wireless/certs/debian.hex -new file mode 100644 -index 000000000000..c5ab03f8c500 --- /dev/null +++ b/net/wireless/certs/debian.hex @@ -0,0 +1,1426 @@ @@ -1447,6 +1444,3 @@ index 000000000000..c5ab03f8c500 +0x44, +0x9f, +0x21, --- -2.25.1 - diff --git a/debian/patches/debian/yama-disable-by-default.patch b/debian/patches/debian/yama-disable-by-default.patch index 3458714..91714cb 100644 --- a/debian/patches/debian/yama-disable-by-default.patch +++ b/debian/patches/debian/yama-disable-by-default.patch @@ -8,8 +8,6 @@ Forwarded: not-needed security/yama/yama_lsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c -index efac68556b45..95ff3e778a17 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -25,7 +25,7 @@ @@ -21,7 +19,7 @@ index efac68556b45..95ff3e778a17 100644 /* describe a ptrace relationship for potential exception */ struct ptrace_relation { -@@ -476,7 +476,7 @@ static inline void yama_init_sysctl(void) { } +@@ -476,7 +476,7 @@ static inline void yama_init_sysctl(void static int __init yama_init(void) { diff --git a/debian/patches/features/all/db-mok-keyring/0003-MODSIGN-checking-the-blacklisted-hash-before-loading-a-kernel-module.patch b/debian/patches/features/all/db-mok-keyring/0003-MODSIGN-checking-the-blacklisted-hash-before-loading-a-kernel-module.patch index f2278ce..382dcf0 100644 --- a/debian/patches/features/all/db-mok-keyring/0003-MODSIGN-checking-the-blacklisted-hash-before-loading-a-kernel-module.patch +++ b/debian/patches/features/all/db-mok-keyring/0003-MODSIGN-checking-the-blacklisted-hash-before-loading-a-kernel-module.patch @@ -39,7 +39,7 @@ Signed-off-by: "Lee, Chun-Yi" #include #include "internal.h" -@@ -37,13 +39,60 @@ +@@ -37,13 +39,60 @@ void set_module_sig_enforced(void) sig_enforce = true; } @@ -101,7 +101,7 @@ Signed-off-by: "Lee, Chun-Yi" int ret; pr_devel("==>%s(,%zu)\n", __func__, modlen); -@@ -51,6 +100,7 @@ +@@ -51,6 +100,7 @@ int mod_verify_sig(const void *mod, stru if (modlen <= sizeof(ms)) return -EBADMSG; @@ -109,7 +109,7 @@ Signed-off-by: "Lee, Chun-Yi" memcpy(&ms, mod + (modlen - sizeof(ms)), sizeof(ms)); ret = mod_check_sig(&ms, modlen, "module"); -@@ -61,10 +111,17 @@ +@@ -61,10 +111,17 @@ int mod_verify_sig(const void *mod, stru modlen -= sig_len + sizeof(ms); info->len = modlen; diff --git a/debian/patches/features/all/db-mok-keyring/trust-machine-keyring-by-default.patch b/debian/patches/features/all/db-mok-keyring/trust-machine-keyring-by-default.patch index c814c6d..c42d138 100644 --- a/debian/patches/features/all/db-mok-keyring/trust-machine-keyring-by-default.patch +++ b/debian/patches/features/all/db-mok-keyring/trust-machine-keyring-by-default.patch @@ -11,8 +11,6 @@ To keep backward compatibility skip this check. security/integrity/platform_certs/machine_keyring.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/security/integrity/platform_certs/machine_keyring.c b/security/integrity/platform_certs/machine_keyring.c -index a401640a63cd..0627f14eacbe 100644 --- a/security/integrity/platform_certs/machine_keyring.c +++ b/security/integrity/platform_certs/machine_keyring.c @@ -68,10 +68,7 @@ static bool __init trust_moklist(void) diff --git a/debian/patches/features/all/drivers-media-dvb-usb-af9005-request_firmware.patch b/debian/patches/features/all/drivers-media-dvb-usb-af9005-request_firmware.patch index a24ba17..6cdf2ab 100644 --- a/debian/patches/features/all/drivers-media-dvb-usb-af9005-request_firmware.patch +++ b/debian/patches/features/all/drivers-media-dvb-usb-af9005-request_firmware.patch @@ -11,11 +11,9 @@ a version of the script which is directly derived from the driver. drivers/media/dvb/dvb-usb/af9005-fe.c | 66 ++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 14 deletions(-) -Index: debian-kernel/drivers/media/usb/dvb-usb/Kconfig -=================================================================== ---- debian-kernel.orig/drivers/media/usb/dvb-usb/Kconfig -+++ debian-kernel/drivers/media/usb/dvb-usb/Kconfig -@@ -260,10 +260,10 @@ config DVB_USB_OPERA1 +--- a/drivers/media/usb/dvb-usb/Kconfig ++++ b/drivers/media/usb/dvb-usb/Kconfig +@@ -35,10 +35,10 @@ config DVB_USB_A800 config DVB_USB_AF9005 tristate "Afatech AF9005 DVB-T USB1.1 support" @@ -27,10 +25,8 @@ Index: debian-kernel/drivers/media/usb/dvb-usb/Kconfig help Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver and the TerraTec Cinergy T USB XE (Rev.1) -Index: debian-kernel/drivers/media/usb/dvb-usb/af9005-fe.c -=================================================================== ---- debian-kernel.orig/drivers/media/usb/dvb-usb/af9005-fe.c -+++ debian-kernel/drivers/media/usb/dvb-usb/af9005-fe.c +--- a/drivers/media/usb/dvb-usb/af9005-fe.c ++++ b/drivers/media/usb/dvb-usb/af9005-fe.c @@ -9,10 +9,26 @@ * see Documentation/driver-api/media/drivers/dvb-usb.rst for more information */ diff --git a/debian/patches/features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch b/debian/patches/features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch index 6f1ba8e..2836779 100644 --- a/debian/patches/features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch +++ b/debian/patches/features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch @@ -40,7 +40,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c -@@ -210,9 +210,10 @@ void __init efi_init(void) +@@ -213,9 +213,10 @@ void __init efi_init(void) { struct efi_memory_map_data data; u64 efi_system_table; @@ -52,7 +52,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] if (!efi_system_table) return; -@@ -234,6 +235,8 @@ void __init efi_init(void) +@@ -237,6 +238,8 @@ void __init efi_init(void) return; } @@ -79,7 +79,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] }; static __initconst const struct { -@@ -41,6 +43,7 @@ static __initconst const struct { +@@ -43,6 +45,7 @@ static __initconst const struct { [MMSIZE] = "xen,uefi-mmap-size", [DCSIZE] = "xen,uefi-mmap-desc-size", [DCVERS] = "xen,uefi-mmap-desc-ver", @@ -87,7 +87,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] } }, { #endif -@@ -51,6 +54,7 @@ static __initconst const struct { +@@ -53,6 +56,7 @@ static __initconst const struct { [MMSIZE] = "linux,uefi-mmap-size", [DCSIZE] = "linux,uefi-mmap-desc-size", [DCVERS] = "linux,uefi-mmap-desc-ver", @@ -95,7 +95,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] } } }; -@@ -62,6 +66,11 @@ static int __init efi_get_fdt_prop(const +@@ -64,6 +68,11 @@ static int __init efi_get_fdt_prop(const int len; u64 val; @@ -107,7 +107,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] prop = fdt_getprop(fdt, node, pname, &len); if (!prop) return 1; -@@ -79,7 +88,7 @@ static int __init efi_get_fdt_prop(const +@@ -81,7 +90,7 @@ static int __init efi_get_fdt_prop(const return 0; } @@ -116,7 +116,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] { const void *fdt = initial_boot_params; unsigned long systab; -@@ -93,6 +102,7 @@ u64 __init efi_get_fdt_params(struct efi +@@ -95,6 +104,7 @@ u64 __init efi_get_fdt_params(struct efi [MMSIZE] = { &mm->size, sizeof(mm->size) }, [DCSIZE] = { &mm->desc_size, sizeof(mm->desc_size) }, [DCVERS] = { &mm->desc_version, sizeof(mm->desc_version) }, @@ -126,7 +126,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name)); --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c -@@ -148,6 +148,12 @@ static efi_status_t update_fdt(void *ori +@@ -132,6 +132,12 @@ static efi_status_t update_fdt(void *ori } } @@ -141,7 +141,7 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c] --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -662,7 +662,8 @@ extern void efi_mem_reserve(phys_addr_t +@@ -766,7 +766,8 @@ extern void efi_mem_reserve(phys_addr_t extern int efi_mem_reserve_persistent(phys_addr_t addr, u64 size); extern void efi_initialize_iomem_resources(struct resource *code_resource, struct resource *data_resource, struct resource *bss_resource); diff --git a/debian/patches/features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch b/debian/patches/features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch index 822beab..491639c 100644 --- a/debian/patches/features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch +++ b/debian/patches/features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch @@ -31,7 +31,7 @@ cc: linux-efi@vger.kernel.org --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1193,19 +1193,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1065,19 +1065,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -54,7 +54,7 @@ cc: linux-efi@vger.kernel.org --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile -@@ -25,6 +25,7 @@ obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_m +@@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub obj-$(CONFIG_EFI_BOOTLOADER_CONTROL) += efibc.o obj-$(CONFIG_EFI_TEST) += test/ obj-$(CONFIG_EFI_DEV_PATH_PARSER) += dev-path-parser.o @@ -106,7 +106,7 @@ cc: linux-efi@vger.kernel.org +} --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -871,6 +871,14 @@ extern int __init efi_setup_pcdp_console +@@ -877,6 +877,14 @@ static inline int efi_range_is_wc(unsign #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ @@ -121,7 +121,7 @@ cc: linux-efi@vger.kernel.org #ifdef CONFIG_EFI /* -@@ -895,6 +903,7 @@ static inline bool efi_rt_services_suppo +@@ -901,6 +909,7 @@ static inline bool efi_rt_services_suppo return (efi.runtime_supported_mask & mask) == mask; } extern void efi_find_mirror(void); @@ -129,7 +129,7 @@ cc: linux-efi@vger.kernel.org #else static inline bool efi_enabled(int feature) { -@@ -914,6 +923,7 @@ static inline bool efi_rt_services_suppo +@@ -920,6 +929,7 @@ static inline bool efi_rt_services_suppo } static inline void efi_find_mirror(void) {} @@ -137,7 +137,7 @@ cc: linux-efi@vger.kernel.org #endif extern int efi_status_to_err(efi_status_t status); -@@ -1133,13 +1143,6 @@ static inline bool efi_runtime_disabled( +@@ -1138,13 +1148,6 @@ static inline bool efi_runtime_disabled( extern void efi_call_virt_check_flags(unsigned long flags, const void *caller); extern unsigned long efi_call_virt_save_flags(void); diff --git a/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch b/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch index f836c8b..918b409 100644 --- a/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch +++ b/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch @@ -26,7 +26,7 @@ Signed-off-by: Salvatore Bonaccorso --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -900,6 +900,8 @@ void __init setup_arch(char **cmdline_p) +@@ -904,6 +904,8 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -35,7 +35,7 @@ Signed-off-by: Salvatore Bonaccorso reserve_ibft_region(); x86_init.resources.dmi_setup(); -@@ -1061,8 +1063,6 @@ void __init setup_arch(char **cmdline_p) +@@ -1065,8 +1067,6 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -67,7 +67,7 @@ Signed-off-by: Salvatore Bonaccorso default: --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -509,6 +509,7 @@ int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); +@@ -509,6 +509,7 @@ int security_inode_getsecctx(struct inod int security_locked_down(enum lockdown_reason what); int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags); @@ -75,7 +75,7 @@ Signed-off-by: Salvatore Bonaccorso #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1483,6 +1484,11 @@ static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, +@@ -1483,6 +1484,11 @@ static inline int lsm_fill_user_ctx(stru { return -EOPNOTSUPP; } diff --git a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch index fedbab5..0e5cc5d 100644 --- a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch +++ b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch @@ -48,7 +48,7 @@ Signed-off-by: Ben Hutchings def_bool y --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -218,13 +218,13 @@ static LIST_HEAD(dmar_satc_units); +@@ -214,13 +214,13 @@ static LIST_HEAD(dmar_satc_units); static void intel_iommu_domain_free(struct iommu_domain *domain); @@ -64,7 +64,7 @@ Signed-off-by: Ben Hutchings static int intel_iommu_superpage = 1; static int iommu_identity_mapping; static int iommu_skip_te_disable; -@@ -263,6 +263,7 @@ static int __init intel_iommu_setup(char +@@ -259,6 +259,7 @@ static int __init intel_iommu_setup(char while (*str) { if (!strncmp(str, "on", 2)) { dmar_disabled = 0; diff --git a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch index 8c82cce..fb327a9 100644 --- a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch +++ b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch @@ -22,7 +22,7 @@ Signed-off-by: Ben Hutchings --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -2174,6 +2174,8 @@ +@@ -2201,6 +2201,8 @@ bypassed by not enabling DMAR with this option. In this case, gfx device will use physical address for DMA. @@ -33,7 +33,7 @@ Signed-off-by: Ben Hutchings sp_off [Default Off] --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -35,6 +35,9 @@ +@@ -36,6 +36,9 @@ #define CONTEXT_SIZE VTD_PAGE_SIZE #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY) @@ -43,7 +43,7 @@ Signed-off-by: Ben Hutchings #define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB) #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA) #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e) -@@ -221,12 +224,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I +@@ -217,12 +220,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled); @@ -58,7 +58,7 @@ Signed-off-by: Ben Hutchings const struct iommu_ops intel_iommu_ops; static const struct iommu_dirty_ops intel_dirty_ops; -@@ -266,6 +271,9 @@ static int __init intel_iommu_setup(char +@@ -262,6 +267,9 @@ static int __init intel_iommu_setup(char } else if (!strncmp(str, "igfx_off", 8)) { disable_igfx_iommu = 1; pr_info("Disable GFX device mapping\n"); @@ -68,7 +68,7 @@ Signed-off-by: Ben Hutchings } else if (!strncmp(str, "forcedac", 8)) { pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n"); iommu_dma_forcedac = true; -@@ -2401,6 +2409,9 @@ static int device_def_domain_type(struct +@@ -2156,6 +2164,9 @@ static int device_def_domain_type(struct if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev)) return IOMMU_DOMAIN_IDENTITY; @@ -78,7 +78,7 @@ Signed-off-by: Ben Hutchings } return 0; -@@ -2701,6 +2712,9 @@ static int __init init_dmars(void) +@@ -2456,6 +2467,9 @@ static int __init init_dmars(void) iommu_set_root_entry(iommu); } diff --git a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch index b4dd9b9..204deac 100644 --- a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch +++ b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch @@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6498,6 +6498,10 @@ +@@ -6578,6 +6578,10 @@ later by a loaded module cannot be set this way. Example: sysctl.vm.swappiness=40 @@ -42,7 +42,7 @@ Signed-off-by: Ben Hutchings Ignore sysrq setting - this boot parameter will --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -3058,6 +3058,14 @@ config COMPAT_32 +@@ -3065,6 +3065,14 @@ config COMPAT_32 select HAVE_UID16 select OLD_SIGSUSPEND3 @@ -80,7 +80,7 @@ Signed-off-by: Ben Hutchings #include #include -@@ -20,3 +23,46 @@ +@@ -23,3 +26,46 @@ long x32_sys_call(const struct pt_regs * default: return __x64_sys_ni_syscall(regs); } }; @@ -159,7 +159,7 @@ Signed-off-by: Ben Hutchings #include /* for TS_COMPAT */ #include -@@ -28,6 +29,18 @@ extern const sys_call_ptr_t ia32_sys_cal +@@ -28,6 +29,18 @@ extern long ia32_sys_call(const struct p extern long x32_sys_call(const struct pt_regs *, unsigned int nr); extern long x64_sys_call(const struct pt_regs *, unsigned int nr); diff --git a/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch b/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch index e8bc1b0..79dc51b 100644 --- a/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch +++ b/debian/patches/features/x86/x86-memtest-WARN-if-bad-RAM-found.patch @@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings --- a/mm/memtest.c +++ b/mm/memtest.c -@@ -26,6 +26,10 @@ static u64 patterns[] __initdata = { +@@ -31,6 +31,10 @@ static u64 patterns[] __initdata = { static void __init reserve_bad_mem(u64 pattern, phys_addr_t start_bad, phys_addr_t end_bad) {