From bf0cfbdd5700b5321ea5275f54ae7fad708a5735 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Fri, 22 Nov 2024 20:01:53 +0300 Subject: [PATCH] release 6.11.10 --- debian/changelog | 7 ++++++ debian/config/config | 1 + ...c-Fix-IDMAC-operation-with-pages-big.patch | 24 ------------------- ...make-x32-syscall-support-conditional.patch | 2 +- ...raysky-s-more-ISA-levels-and-uarches.patch | 2 +- ...raysky-s-more-ISA-levels-and-uarches.patch | 4 ++-- ..._get_highest_perf-from-amd.c-to-cppc.patch | 2 +- ...m-Allow-override-of-min_power_limit-.patch | 4 ++-- ...VE-mm-swap-Disable-swap-in-readahead.patch | 4 ++-- ...pd-early-when-nothing-s-waiting-for-.patch | 6 ++--- debian/patches/series | 1 - 11 files changed, 20 insertions(+), 37 deletions(-) delete mode 100644 debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch diff --git a/debian/changelog b/debian/changelog index 0c05ccf..8e16257 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (6.11.10-1) sid; urgency=medium + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.10 + + -- Konstantin Demin Fri, 22 Nov 2024 19:59:35 +0300 + linux (6.11.9-1) sid; urgency=medium * New upstream stable update: diff --git a/debian/config/config b/debian/config/config index da524ba..37ab0f6 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3289,6 +3289,7 @@ CONFIG_APERTURE_HELPERS=y CONFIG_ARCH_CLOCKSOURCE_INIT=y CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y +CONFIG_ARCH_DEFAULT_CRASH_DUMP=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 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 deleted file mode 100644 index 61674be..0000000 --- a/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ae6a452692f8b02115019b0b62ac82ae2c432f59 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Wed, 23 Oct 2024 21:28:33 +0200 -Subject: [PATCH] Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger - than 4K" - -This reverts commit 8396c793ffdf28bb8aee7cfe0891080f8cab7890. ---- - drivers/mmc/host/dw_mmc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- 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_mc - if (host->use_dma == TRANS_MODE_IDMAC) { - mmc->max_segs = host->ring_size; - mmc->max_blk_size = 65535; -- mmc->max_req_size = DW_MCI_DESC_DATA_LENGTH * host->ring_size; -- mmc->max_seg_size = mmc->max_req_size; -+ mmc->max_seg_size = 0x1000; -+ mmc->max_req_size = mmc->max_seg_size * host->ring_size; - mmc->max_blk_count = mmc->max_req_size / 512; - } else if (host->use_dma == TRANS_MODE_EDMAC) { - mmc->max_segs = 64; 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 b1a845c..a092aae 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 @@ -42,7 +42,7 @@ Signed-off-by: Ben Hutchings Ignore sysrq setting - this boot parameter will --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -3066,6 +3066,14 @@ config COMPAT_32 +@@ -3069,6 +3069,14 @@ config COMPAT_32 select HAVE_UID16 select OLD_SIGSUSPEND3 diff --git a/debian/patches/mixed-arch/0001-ZEN-Add-graysky-s-more-ISA-levels-and-uarches.patch b/debian/patches/mixed-arch/0001-ZEN-Add-graysky-s-more-ISA-levels-and-uarches.patch index dda4678..e142f9b 100644 --- a/debian/patches/mixed-arch/0001-ZEN-Add-graysky-s-more-ISA-levels-and-uarches.patch +++ b/debian/patches/mixed-arch/0001-ZEN-Add-graysky-s-more-ISA-levels-and-uarches.patch @@ -572,7 +572,7 @@ REFERENCES # P6_NOPs are a relatively minor optimization that require a family >= --- a/arch/x86/Makefile +++ b/arch/x86/Makefile -@@ -178,14 +178,99 @@ else +@@ -179,14 +179,99 @@ else cflags-$(CONFIG_MPSC) += -march=nocona cflags-$(CONFIG_MCORE2) += -march=core2 cflags-$(CONFIG_MATOM) += -march=atom diff --git a/debian/patches/mixed-arch/0002-ZEN-Fixup-graysky-s-more-ISA-levels-and-uarches.patch b/debian/patches/mixed-arch/0002-ZEN-Fixup-graysky-s-more-ISA-levels-and-uarches.patch index 35fee6e..65ca255 100644 --- a/debian/patches/mixed-arch/0002-ZEN-Fixup-graysky-s-more-ISA-levels-and-uarches.patch +++ b/debian/patches/mixed-arch/0002-ZEN-Fixup-graysky-s-more-ISA-levels-and-uarches.patch @@ -25,7 +25,7 @@ See: https://github.com/graysky2/kernel_compiler_patch/issues/105 depends on X86_32 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile -@@ -176,8 +176,6 @@ else +@@ -177,8 +177,6 @@ else # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu) cflags-$(CONFIG_MK8) += -march=k8 cflags-$(CONFIG_MPSC) += -march=nocona @@ -34,7 +34,7 @@ See: https://github.com/graysky2/kernel_compiler_patch/issues/105 ifeq ($(CONFIG_X86_64_VERSION),1) cflags-$(CONFIG_GENERIC_CPU) += -mtune=generic rustflags-$(CONFIG_GENERIC_CPU) += -Ztune-cpu=generic -@@ -229,8 +227,6 @@ else +@@ -230,8 +228,6 @@ else rustflags-$(CONFIG_MK8) += -Ctarget-cpu=k8 rustflags-$(CONFIG_MPSC) += -Ctarget-cpu=nocona diff --git a/debian/patches/patchset-pf/amd-pstate/0005-x86-amd-Move-amd_get_highest_perf-from-amd.c-to-cppc.patch b/debian/patches/patchset-pf/amd-pstate/0005-x86-amd-Move-amd_get_highest_perf-from-amd.c-to-cppc.patch index 32b183b..e5e41ad 100644 --- a/debian/patches/patchset-pf/amd-pstate/0005-x86-amd-Move-amd_get_highest_perf-from-amd.c-to-cppc.patch +++ b/debian/patches/patchset-pf/amd-pstate/0005-x86-amd-Move-amd_get_highest_perf-from-amd.c-to-cppc.patch @@ -42,7 +42,7 @@ Reviewed-by: Gautham R. Shenoy +EXPORT_SYMBOL_GPL(amd_get_highest_perf); --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c -@@ -1190,22 +1190,6 @@ unsigned long amd_get_dr_addr_mask(unsig +@@ -1201,22 +1201,6 @@ unsigned long amd_get_dr_addr_mask(unsig } EXPORT_SYMBOL_GPL(amd_get_dr_addr_mask); diff --git a/debian/patches/patchset-zen/sauce/0009-ZEN-drm-amdgpu-pm-Allow-override-of-min_power_limit-.patch b/debian/patches/patchset-zen/sauce/0009-ZEN-drm-amdgpu-pm-Allow-override-of-min_power_limit-.patch index ef0315e..6e2803b 100644 --- a/debian/patches/patchset-zen/sauce/0009-ZEN-drm-amdgpu-pm-Allow-override-of-min_power_limit-.patch +++ b/debian/patches/patchset-zen/sauce/0009-ZEN-drm-amdgpu-pm-Allow-override-of-min_power_limit-.patch @@ -61,7 +61,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c -@@ -2785,7 +2785,10 @@ int smu_get_power_limit(void *handle, +@@ -2775,7 +2775,10 @@ int smu_get_power_limit(void *handle, *limit = smu->max_power_limit; break; case SMU_PPT_LIMIT_MIN: @@ -73,7 +73,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with break; default: return -EINVAL; -@@ -2809,7 +2812,14 @@ static int smu_set_power_limit(void *han +@@ -2799,7 +2802,14 @@ static int smu_set_power_limit(void *han if (smu->ppt_funcs->set_power_limit) return smu->ppt_funcs->set_power_limit(smu, limit_type, limit); diff --git a/debian/patches/patchset-zen/sauce/0023-ZEN-INTERACTIVE-mm-swap-Disable-swap-in-readahead.patch b/debian/patches/patchset-zen/sauce/0023-ZEN-INTERACTIVE-mm-swap-Disable-swap-in-readahead.patch index 35de516..55146b0 100644 --- a/debian/patches/patchset-zen/sauce/0023-ZEN-INTERACTIVE-mm-swap-Disable-swap-in-readahead.patch +++ b/debian/patches/patchset-zen/sauce/0023-ZEN-INTERACTIVE-mm-swap-Disable-swap-in-readahead.patch @@ -30,7 +30,7 @@ same change so Zen Kernel users benefit. --- a/mm/swap.c +++ b/mm/swap.c -@@ -1126,6 +1126,10 @@ void folio_batch_remove_exceptionals(str +@@ -1112,6 +1112,10 @@ void folio_batch_remove_exceptionals(str */ void __init swap_setup(void) { @@ -41,7 +41,7 @@ same change so Zen Kernel users benefit. unsigned long megs = totalram_pages() >> (20 - PAGE_SHIFT); /* Use a smaller cluster for small-memory machines */ -@@ -1137,4 +1141,5 @@ void __init swap_setup(void) +@@ -1123,4 +1127,5 @@ void __init swap_setup(void) * Right now other parts of the system means that we * _really_ don't want to cluster much more */ diff --git a/debian/patches/patchset-zen/sauce/0025-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch b/debian/patches/patchset-zen/sauce/0025-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch index 47fc4ff..419e48d 100644 --- a/debian/patches/patchset-zen/sauce/0025-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch +++ b/debian/patches/patchset-zen/sauce/0025-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch @@ -62,7 +62,7 @@ Contains: /* prevent >1 _updater_ of zone percpu pageset ->high and ->batch fields */ static DEFINE_MUTEX(pcp_batch_high_lock); #define MIN_PERCPU_PAGELIST_HIGH_FRACTION (8) -@@ -4189,6 +4191,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, u +@@ -4204,6 +4206,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, u unsigned int cpuset_mems_cookie; unsigned int zonelist_iter_cookie; int reserve_flags; @@ -70,7 +70,7 @@ Contains: restart: compaction_retries = 0; -@@ -4228,8 +4231,13 @@ restart: +@@ -4243,8 +4246,13 @@ restart: goto nopage; } @@ -85,7 +85,7 @@ Contains: /* * The adjusted alloc_flags might result in immediate success, so try -@@ -4445,9 +4453,12 @@ nopage: +@@ -4460,9 +4468,12 @@ nopage: goto retry; } fail: diff --git a/debian/patches/series b/debian/patches/series index cfe1f6e..a8a4ab0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -72,7 +72,6 @@ features/x86/x86-make-x32-syscall-support-conditional.patch bugfix/all/disable-some-marvell-phys.patch bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch bugfix/all/documentation-use-relative-source-paths-in-abi-documentation.patch -bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch # Miscellaneous features