From: Arne Fitzenreiter Date: Wed, 2 Apr 2025 07:44:24 +0000 (+0200) Subject: kernel: update to 6.12.21 X-Git-Tag: v2.29-core194~13^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4726d9aff6374f1efe95d67a283988d41e6f79d;p=ipfire-2.x.git kernel: update to 6.12.21 MD_LINEAR (JBOD) is now back in the mainline kernel Signed-off-by: Arne Fitzenreiter --- diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index c0cd6894d..ed0782ec9 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.13 Kernel Configuration +# Linux/arm64 6.12.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24300 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24300 +CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=108300 CONFIG_RUSTC_LLVM_VERSION=190101 @@ -2521,6 +2521,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m @@ -2670,6 +2671,7 @@ CONFIG_NET_DSA_REALTEK_MDIO=y CONFIG_NET_DSA_REALTEK_SMI=y CONFIG_NET_DSA_REALTEK_RTL8365MB=m CONFIG_NET_DSA_REALTEK_RTL8366RB=m +CONFIG_NET_DSA_REALTEK_RTL8366RB_LEDS=y CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -7827,7 +7829,6 @@ CONFIG_IRQ_MSI_LIB=y # CONFIG_AL_FIC is not set CONFIG_BRCMSTB_L2_IRQ=y CONFIG_DW_APB_ICTL=y -CONFIG_LAN966X_OIC=m CONFIG_SUN6I_R_INTC=y CONFIG_SUNXI_NMI_INTC=y # CONFIG_XILINX_INTC is not set diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 1f5c82cf0..c75ddb721 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -2252,6 +2252,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index eb24bfac0..03a9d9817 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.13 Kernel Configuration +# Linux/x86 6.12.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24300 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24300 +CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=108300 CONFIG_RUSTC_LLVM_VERSION=190101 @@ -70,7 +70,6 @@ CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_GENERIC_IRQ_INJECTION=y CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_SIM=y CONFIG_IRQ_DOMAIN_HIERARCHY=y @@ -2082,7 +2081,6 @@ CONFIG_EFI_EARLYCON=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y -# CONFIG_IMX_SCMI_MISC_DRV is not set # # Qualcomm firmware drivers @@ -2496,6 +2494,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y +CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m @@ -5429,6 +5428,8 @@ CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_PANIC is not set # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set +CONFIG_DRM_CLIENT_SELECTION=y +CONFIG_DRM_CLIENT_SETUP=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set @@ -6796,7 +6797,6 @@ CONFIG_LTE_GDM724X=m # CONFIG_VME_BUS is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set -# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_SURFACE_PLATFORMS=y # CONFIG_SURFACE_3_POWER_OPREGION is not set @@ -7108,7 +7108,6 @@ CONFIG_MEMORY=y # # IRQ chip support # -CONFIG_LAN966X_OIC=m CONFIG_MADERA_IRQ=m # end of IRQ chip support diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index dd1278c00..ca6847ca2 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9542,7 +9542,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/L2TP_IP #lib/modules/KVER/build/include/config/L2TP_V3 #lib/modules/KVER/build/include/config/LAN743X -#lib/modules/KVER/build/include/config/LAN966X_OIC #lib/modules/KVER/build/include/config/LAN966X_SWITCH #lib/modules/KVER/build/include/config/LCD_CLASS_DEVICE #lib/modules/KVER/build/include/config/LCD_PLATFORM @@ -9680,6 +9679,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/MDIO_SUN4I #lib/modules/KVER/build/include/config/MD_AUTODETECT #lib/modules/KVER/build/include/config/MD_BITMAP_FILE +#lib/modules/KVER/build/include/config/MD_LINEAR #lib/modules/KVER/build/include/config/MD_RAID0 #lib/modules/KVER/build/include/config/MD_RAID1 #lib/modules/KVER/build/include/config/MD_RAID10 @@ -10139,6 +10139,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_MDIO #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_RTL8365MB #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_RTL8366RB +#lib/modules/KVER/build/include/config/NET_DSA_REALTEK_RTL8366RB_LEDS #lib/modules/KVER/build/include/config/NET_DSA_REALTEK_SMI #lib/modules/KVER/build/include/config/NET_DSA_SMSC_LAN9303 #lib/modules/KVER/build/include/config/NET_DSA_SMSC_LAN9303_I2C @@ -12441,6 +12442,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_buddy.h #lib/modules/KVER/build/include/drm/drm_cache.h #lib/modules/KVER/build/include/drm/drm_client.h +#lib/modules/KVER/build/include/drm/drm_client_setup.h #lib/modules/KVER/build/include/drm/drm_color_mgmt.h #lib/modules/KVER/build/include/drm/drm_connector.h #lib/modules/KVER/build/include/drm/drm_crtc.h @@ -12457,6 +12459,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_exec.h #lib/modules/KVER/build/include/drm/drm_fb_dma_helper.h #lib/modules/KVER/build/include/drm/drm_fb_helper.h +#lib/modules/KVER/build/include/drm/drm_fbdev_client.h #lib/modules/KVER/build/include/drm/drm_fbdev_dma.h #lib/modules/KVER/build/include/drm/drm_fbdev_shmem.h #lib/modules/KVER/build/include/drm/drm_fbdev_ttm.h @@ -13789,6 +13792,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/cache.h #lib/modules/KVER/build/include/linux/cacheflush.h #lib/modules/KVER/build/include/linux/cacheinfo.h +#lib/modules/KVER/build/include/linux/call_once.h #lib/modules/KVER/build/include/linux/can #lib/modules/KVER/build/include/linux/can/bittiming.h #lib/modules/KVER/build/include/linux/can/can-ml.h @@ -21479,7 +21483,6 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/input/sparse-keymap.ko.xz #lib/modules/KVER/kernel/drivers/irqchip #lib/modules/KVER/kernel/drivers/irqchip/irq-imx-mu-msi.ko.xz -#lib/modules/KVER/kernel/drivers/irqchip/irq-lan966x-oic.ko.xz #lib/modules/KVER/kernel/drivers/leds #lib/modules/KVER/kernel/drivers/leds/leds-bd2802.ko.xz #lib/modules/KVER/kernel/drivers/leds/leds-blinkm.ko.xz @@ -21528,6 +21531,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/md/dm-vdo/dm-vdo.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-writecache.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-zero.ko.xz +#lib/modules/KVER/kernel/drivers/md/linear.ko.xz #lib/modules/KVER/kernel/drivers/md/persistent-data #lib/modules/KVER/kernel/drivers/md/persistent-data/dm-persistent-data.ko.xz #lib/modules/KVER/kernel/drivers/md/raid0.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index cfb63f24b..845f28b51 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -7965,6 +7965,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/DRM_BRIDGE #lib/modules/KVER/build/include/config/DRM_BUDDY #lib/modules/KVER/build/include/config/DRM_CIRRUS_QEMU +#lib/modules/KVER/build/include/config/DRM_CLIENT_SELECTION +#lib/modules/KVER/build/include/config/DRM_CLIENT_SETUP #lib/modules/KVER/build/include/config/DRM_DISPLAY_DP_HELPER #lib/modules/KVER/build/include/config/DRM_DISPLAY_HDCP_HELPER #lib/modules/KVER/build/include/config/DRM_DISPLAY_HDMI_HELPER @@ -8461,7 +8463,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/GENERIC_ENTRY #lib/modules/KVER/build/include/config/GENERIC_GETTIMEOFDAY #lib/modules/KVER/build/include/config/GENERIC_IOMAP -#lib/modules/KVER/build/include/config/GENERIC_IRQ_CHIP #lib/modules/KVER/build/include/config/GENERIC_IRQ_EFFECTIVE_AFF_MASK #lib/modules/KVER/build/include/config/GENERIC_IRQ_INJECTION #lib/modules/KVER/build/include/config/GENERIC_IRQ_MATRIX_ALLOCATOR @@ -9219,7 +9220,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/L2TP_IP #lib/modules/KVER/build/include/config/L2TP_V3 #lib/modules/KVER/build/include/config/LAN743X -#lib/modules/KVER/build/include/config/LAN966X_OIC #lib/modules/KVER/build/include/config/LCD_CLASS_DEVICE #lib/modules/KVER/build/include/config/LCD_PLATFORM #lib/modules/KVER/build/include/config/LDM_PARTITION @@ -9363,6 +9363,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/MDIO_THUNDER #lib/modules/KVER/build/include/config/MD_AUTODETECT #lib/modules/KVER/build/include/config/MD_BITMAP_FILE +#lib/modules/KVER/build/include/config/MD_LINEAR #lib/modules/KVER/build/include/config/MD_RAID0 #lib/modules/KVER/build/include/config/MD_RAID1 #lib/modules/KVER/build/include/config/MD_RAID10 @@ -12346,6 +12347,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_buddy.h #lib/modules/KVER/build/include/drm/drm_cache.h #lib/modules/KVER/build/include/drm/drm_client.h +#lib/modules/KVER/build/include/drm/drm_client_setup.h #lib/modules/KVER/build/include/drm/drm_color_mgmt.h #lib/modules/KVER/build/include/drm/drm_connector.h #lib/modules/KVER/build/include/drm/drm_crtc.h @@ -12362,6 +12364,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/drm/drm_exec.h #lib/modules/KVER/build/include/drm/drm_fb_dma_helper.h #lib/modules/KVER/build/include/drm/drm_fb_helper.h +#lib/modules/KVER/build/include/drm/drm_fbdev_client.h #lib/modules/KVER/build/include/drm/drm_fbdev_dma.h #lib/modules/KVER/build/include/drm/drm_fbdev_shmem.h #lib/modules/KVER/build/include/drm/drm_fbdev_ttm.h @@ -13693,6 +13696,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/linux/cache.h #lib/modules/KVER/build/include/linux/cacheflush.h #lib/modules/KVER/build/include/linux/cacheinfo.h +#lib/modules/KVER/build/include/linux/call_once.h #lib/modules/KVER/build/include/linux/can #lib/modules/KVER/build/include/linux/can/bittiming.h #lib/modules/KVER/build/include/linux/can/can-ml.h @@ -21569,7 +21573,6 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/iommu #lib/modules/KVER/kernel/drivers/iommu/virtio-iommu.ko.xz #lib/modules/KVER/kernel/drivers/irqchip -#lib/modules/KVER/kernel/drivers/irqchip/irq-lan966x-oic.ko.xz #lib/modules/KVER/kernel/drivers/irqchip/irq-madera.ko.xz #lib/modules/KVER/kernel/drivers/leds #lib/modules/KVER/kernel/drivers/leds/leds-apu.ko.xz @@ -21626,6 +21629,7 @@ lib/modules/KVER/kernel #lib/modules/KVER/kernel/drivers/md/dm-writecache.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-zero.ko.xz #lib/modules/KVER/kernel/drivers/md/dm-zoned.ko.xz +#lib/modules/KVER/kernel/drivers/md/linear.ko.xz #lib/modules/KVER/kernel/drivers/md/persistent-data #lib/modules/KVER/kernel/drivers/md/persistent-data/dm-persistent-data.ko.xz #lib/modules/KVER/kernel/drivers/md/raid0.ko.xz diff --git a/lfs/linux b/lfs/linux index a58257fba..5317a4965 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.12.13 +VER = 6.12.21 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -69,7 +69,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611 +$(DL_FILE)_BLAKE2 = 3dad715ed88f08c680837f7f74d0cb759f1a50f597820a9885863fba48cc13b10d4efa65ad821c02cfbbd7f0b814f4498cf15f4274cd9249b49edd5a37ea0728 install : $(TARGET)