commit f9c26bf3bb8af99f4d9579e2a9fed6ce0bdded65 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Sat Apr 13 21:14:57 2024 +0200
Up to 5.15.155. kernel-multiarch.config | 41 +++++++++++++++++++---------------------- kernel-x86.config | 15 +++++++++------ kernel.spec | 4 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index 899e99e1..50d60f6a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ %define rel 1 %define basever 5.15 -%define postver .152 +%define postver .155 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -121,7 +121,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz # Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: 004d47b3afe0be70b52bcca37a34a578 +# Patch0-md5: 4373b80f34634df1d69465a2da88c16d %endif Source1: kernel.sysconfig diff --git a/kernel-multiarch.config b/kernel-multiarch.config index e3c1904a..16439c4d 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -225,7 +225,7 @@ CRYPTO_CRC32 all=m CRYPTO_CRC32_PCLMUL all=m CRYPTO_XXHASH all=m CRYPTO_BLAKE2B all=m -CRYPTO_BLAKE2S_X86 all=m +CRYPTO_BLAKE2S_X86 all=y CRYPTO_CRCT10DIF all=y CRYPTO_CRCT10DIF_PCLMUL all=m CRYPTO_GHASH all=m @@ -663,7 +663,6 @@ BLK_DEV_LOOP_MIN_COUNT all=8 BLK_DEV_CRYPTOLOOP all=n #- file drivers/block/drbd/Kconfig goes here BLK_DEV_NBD all=m -BLK_DEV_SX8 all=m BLK_DEV_RAM all=y BLK_DEV_RAM_COUNT all=16 BLK_DEV_RAM_SIZE all=16384 @@ -2957,6 +2956,7 @@ IIO_SW_DEVICE all=m IIO_SW_TRIGGER all=m #- file drivers/iio/accel/Kconfig goes here #- file drivers/iio/adc/Kconfig goes here +#- file drivers/iio/addac/Kconfig goes here #- file drivers/iio/afe/Kconfig goes here #- file drivers/iio/amplifiers/Kconfig goes here #- file drivers/iio/cdc/Kconfig goes here @@ -3086,7 +3086,6 @@ RN5T618_ADC arm=m arm64=m ROCKCHIP_SARADC arm64=m SD_ADC_MODULATOR arm=m arm64=m STMPE_ADC arm=m arm64=m -STX104 all=m TI_ADC081C all=m TI_ADC0832 all=m TI_ADC084S021 all=m @@ -3107,6 +3106,11 @@ VF610_ADC arm=m arm64=m VIPERBOARD_ADC all=m XILINX_XADC all=m +#- +#- *** FILE: drivers/iio/addac/Kconfig *** +#- +STX104 all=m + #- #- *** FILE: drivers/iio/afe/Kconfig *** #- @@ -8295,6 +8299,7 @@ PCI_ENDPOINT_CONFIGFS all=y #- PCI_EPF_TEST all=m PCI_EPF_NTB all=m +PCI_EPF_VNTB all=m #- #- *** FILE: drivers/pci/hotplug/Kconfig *** @@ -11955,8 +11960,8 @@ NFS_DISABLE_UDP_SUPPORT all=y #- *** FILE: fs/nfsd/Kconfig *** #- NFSD all=m +NFSD_V2 all=y NFSD_V2_ACL all=y -NFSD_V3 all=y NFSD_V3_ACL all=y NFSD_V4 all=y NFSD_PNFS all=y @@ -13029,7 +13034,6 @@ BRIDGE_NETFILTER all=m #- file net/netfilter/Kconfig goes here #- file net/ipv4/netfilter/Kconfig goes here #- file net/ipv6/netfilter/Kconfig goes here -#- file net/decnet/netfilter/Kconfig goes here #- file net/bridge/netfilter/Kconfig goes here #- file net/bpfilter/Kconfig goes here #- file net/dccp/Kconfig goes here @@ -13042,7 +13046,6 @@ BRIDGE_NETFILTER all=m #- file net/bridge/Kconfig goes here #- file net/dsa/Kconfig goes here #- file net/8021q/Kconfig goes here -#- file net/decnet/Kconfig goes here #- file net/llc/Kconfig goes here #- file drivers/net/appletalk/Kconfig goes here #- file net/x25/Kconfig goes here @@ -13268,17 +13271,6 @@ IP_DCCP_CCID3 all=y IP_DCCP_CCID3_DEBUG all=n IP_DCCP_TFRC_LIB all=y -#- -#- *** FILE: net/decnet/Kconfig *** -#- -DECNET all=m -DECNET_ROUTER all=y - -#- -#- *** FILE: net/decnet/netfilter/Kconfig *** -#- -DECNET_NF_GRABULATOR all=m - #- #- *** FILE: net/dns_resolver/Kconfig *** #- @@ -13864,10 +13856,8 @@ RXKAD all=y #- NET_SCHED all=y #- Queueing/Scheduling -NET_SCH_CBQ all=m NET_SCH_HTB all=m NET_SCH_HFSC all=m -NET_SCH_ATM all=m NET_SCH_PRIO all=m NET_SCH_MULTIQ all=m NET_SCH_RED all=m @@ -13879,7 +13869,6 @@ NET_SCH_CBS all=m NET_SCH_ETF all=m NET_SCH_TAPRIO all=m NET_SCH_GRED all=m -NET_SCH_DSMARK all=m NET_SCH_NETEM all=m NET_SCH_DRR all=m NET_SCH_MQPRIO all=m @@ -13911,8 +13900,6 @@ NET_CLS_FW all=m NET_CLS_U32 all=m CLS_U32_PERF all=y CLS_U32_MARK all=y -NET_CLS_RSVP all=m -NET_CLS_RSVP6 all=m NET_CLS_FLOW all=m NET_CLS_CGROUP all=y NET_CLS_BPF all=m @@ -15141,6 +15128,7 @@ BLK_DEV_SIS5513 i386=m x86_64=m BLK_DEV_SL82C105 arm=m ppc=m ppc64=m BLK_DEV_SLC90E66 all=m BLK_DEV_SVWKS all=m +BLK_DEV_SX8 all=m BLK_DEV_TC86C001 all=m BLK_DEV_TRIFLEX all=m BLK_DEV_TRM290 all=m @@ -15155,6 +15143,9 @@ CRYPTO_LIB_BLAKE2S all=m CYCLADES all=m CYZ_INTR all=n DEBUG_BLOCK_EXT_DEVT all=n +DECNET all=m +DECNET_NF_GRABULATOR all=m +DECNET_ROUTER all=y DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config" DEFXX_MMIO all=n DEVKMEM all=y @@ -15188,8 +15179,14 @@ MLXSW_SWITCHIB all=m MLXSW_SWITCHX2 all=m MODULE_COMPRESS all=y MOST_SOUND all=m +NET_CLS_RSVP all=m +NET_CLS_RSVP6 all=m NET_CLS_TCINDEX all=m NET_DSA_TAG_8021Q all=m +NET_SCH_ATM all=m +NET_SCH_CBQ all=m +NET_SCH_DSMARK all=m +NFSD_V3 all=y NF_LOG_BRIDGE all=m NF_LOG_NETDEV all=m NVM all=y diff --git a/kernel-x86.config b/kernel-x86.config index dacfba1f..b4efbe56 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -6,9 +6,6 @@ SMP x86=y X86_X2APIC all=y X86_MPPARSE x86=y -RETPOLINE x86=y -SLS x86=y -GDS_FORCE_MITIGATION all=n X86_CPU_RESCTRL all=y X86_BIGSMP i386=y X86_EXTENDED_PLATFORM i386=y x86_64=y @@ -78,7 +75,6 @@ X86_PMEM_LEGACY x86=y HIGHPTE i386=n X86_CHECK_BIOS_CORRUPTION x86=y X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK x86=y -X86_RESERVE_LOW x86=64 MATH_EMULATION i386=y i686=n pentium3=n pentium4=n athlon=n MTRR x86=y MTRR_SANITIZER x86=y @@ -108,6 +104,13 @@ LEGACY_VSYSCALL_XONLY all=y LEGACY_VSYSCALL_NONE all=n CMDLINE_BOOL x86=n #- file kernel/livepatch/Kconfig goes here +RETPOLINE x86=y +SLS x86=y +GDS_FORCE_MITIGATION all=n +MITIGATION_RFDS x86_64=y +SPECTRE_BHI_ON x86=y x86_64=y +SPECTRE_BHI_OFF x86=n x86_64=n +SPECTRE_BHI_AUTO x86=n x86_64=n #- file kernel/power/Kconfig goes here #- file drivers/acpi/Kconfig goes here APM i386=m @@ -134,7 +137,6 @@ GEOS i486=y i586=y i686=y IA32_EMULATION x86_64=y IA32_AOUT x86_64=y X86_X32 x86_64=y -#- file drivers/firmware/Kconfig goes here #- file arch/x86/kvm/Kconfig goes here #- file arch/x86/Kconfig.assembler goes here @@ -227,6 +229,7 @@ X86_E_POWERSAVER i386=m X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y #- -#- *** FILE: drivers/firmware/efi/Kconfig *** +#- *** PROBABLY REMOVED OPTIONS *** #- EFI_CAPSULE_QUIRK_QUARK_CSH i386=y +X86_RESERVE_LOW x86=64 ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/f9c26bf3bb8af99f4d9579e2a9fed6ce0bdded65 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit