diff --git a/config/riscv64/default b/config/riscv64/default index d994163..8016dc5 100644 --- a/config/riscv64/default +++ b/config/riscv64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.8.0-rc6 Kernel Configuration +# Linux/riscv 6.8.0-rc7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -324,6 +324,7 @@ CONFIG_LOCKDEP_SUPPORT=y CONFIG_RISCV_DMA_NONCOHERENT=y CONFIG_RISCV_NONSTANDARD_CACHE_OPS=y CONFIG_AS_HAS_INSN=y +CONFIG_AS_HAS_OPTION_ARCH=y # # SoC selection @@ -376,6 +377,13 @@ CONFIG_RISCV_ALTERNATIVE_EARLY=y CONFIG_RISCV_ISA_C=y CONFIG_RISCV_ISA_SVNAPOT=y CONFIG_RISCV_ISA_SVPBMT=y +CONFIG_TOOLCHAIN_HAS_V=y +CONFIG_RISCV_ISA_V=y +CONFIG_RISCV_ISA_V_DEFAULT_ENABLE=y +CONFIG_RISCV_ISA_V_UCOPY_THRESHOLD=768 +CONFIG_RISCV_ISA_V_PREEMPTIVE=y +CONFIG_TOOLCHAIN_HAS_ZBB=y +CONFIG_RISCV_ISA_ZBB=y CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y @@ -647,6 +655,7 @@ CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y +CONFIG_DYNAMIC_SIGFRAME=y # # GCOV-based kernel profiling diff --git a/patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch b/patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch deleted file mode 100644 index 451b77a..0000000 --- a/patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Randy Dunlap -Date: Sun, 25 Feb 2024 23:48:20 -0800 -Subject: net: ethernet: adi: move PHYLIB from vendor to driver symbol -Patch-mainline: submitted - 2024-02-26 - 20240226074820.29250-1-rdunlap@infradead.org -References: none - -In a previous patch I added "select PHYLIB" at the wrong place for the -ADIN1110 driver symbol, so move it to its correct place under the -ADIN1110 kconfig symbol. - -Fixes: a9f80df4f514 ("net: ethernet: adi: requires PHYLIB support") -Signed-off-by: Randy Dunlap -Reported-by: Michal Kubecek -Reported-by: Michal Kubecek -Closes: https://lore.kernel.org/lkml/77012b38-4b49-47f4-9a88-d773d52909ad@infradead.org/T/#m8ba397484738711edc0ad607b2c63ca02244e3c3 -Cc: Lennart Franzen -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Cc: Nuno Sa -Acked-by: Michal Kubecek ---- - drivers/net/ethernet/adi/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/adi/Kconfig -+++ b/drivers/net/ethernet/adi/Kconfig -@@ -7,7 +7,6 @@ config NET_VENDOR_ADI - bool "Analog Devices devices" - default y - depends on SPI -- select PHYLIB - help - If you have a network (Ethernet) card belonging to this class, say Y. - -@@ -22,6 +21,7 @@ config ADIN1110 - tristate "Analog Devices ADIN1110 MAC-PHY" - depends on SPI && NET_SWITCHDEV - select CRC8 -+ select PHYLIB - help - Say yes here to build support for Analog Devices ADIN1110 - Low Power 10BASE-T1L Ethernet MAC-PHY. diff --git a/rpm/config.sh b/rpm/config.sh index d674291..9024b1c 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=6.8-rc6 +SRCVERSION=6.8-rc7 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression diff --git a/series.conf b/series.conf index aa6ce2b..9506cf0 100644 --- a/series.conf +++ b/series.conf @@ -37,7 +37,6 @@ patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch - patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch ######################################################## # The sorted section should contain all patches that are