From f30721fc59ebb7d8d19ff2b9047e09a5af8155e5 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 1 Dec 2023 20:48:59 +0100 Subject: [PATCH] - updated to 4.14.331 --- kernel-x86.config | 18 ++++-------------- kernel-x86_64.config | 18 ++++-------------- kernel.spec | 4 ++-- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/kernel-x86.config b/kernel-x86.config index 9247d7a..59b5001 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.291-4.14 Kernel Configuration +# Linux/x86 4.14.331-4.14 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -271,6 +271,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y @@ -671,6 +672,7 @@ CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y +# CONFIG_GDS_FORCE_MITIGATION is not set # # Power management and ACPI options @@ -1013,6 +1015,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m @@ -1397,11 +1400,6 @@ CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m @@ -1488,8 +1486,6 @@ CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_IPX=m @@ -1569,14 +1565,11 @@ CONFIG_DEFAULT_NET_SCH="pfifo_fast" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_BPF=m @@ -2180,7 +2173,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -6050,8 +6042,6 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ARCPGU=m CONFIG_DRM_HISI_HIBMC=m -CONFIG_DRM_MXS=y -CONFIG_DRM_MXSFB=m CONFIG_DRM_TINYDRM=m CONFIG_TINYDRM_MIPI_DBI=m CONFIG_TINYDRM_MI0283QT=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index cd187e1..cfb4ef2 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.291-4.14 Kernel Configuration +# Linux/x86 4.14.331-4.14 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -281,6 +281,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y @@ -696,6 +697,7 @@ CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y +# CONFIG_GDS_FORCE_MITIGATION is not set # # Power management and ACPI options @@ -1010,6 +1012,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m @@ -1394,11 +1397,6 @@ CONFIG_IP6_NF_SECURITY=m CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m @@ -1485,8 +1483,6 @@ CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_IPX=m @@ -1562,14 +1558,11 @@ CONFIG_DEFAULT_NET_SCH="pfifo_fast" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_BPF=m @@ -2164,7 +2157,6 @@ CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SKD=m -CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -5920,8 +5912,6 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_HSA_AMD=m CONFIG_DRM_ARCPGU=m CONFIG_DRM_HISI_HIBMC=m -CONFIG_DRM_MXS=y -CONFIG_DRM_MXSFB=m CONFIG_DRM_TINYDRM=m CONFIG_TINYDRM_MIPI_DBI=m CONFIG_TINYDRM_MI0283QT=m diff --git a/kernel.spec b/kernel.spec index 283f103..524f1ce 100644 --- a/kernel.spec +++ b/kernel.spec @@ -4,7 +4,7 @@ %bcond_with verbose # verbose build (V=1) %define basever 4.14 -%define postver 307 +%define postver 331 %define rel 1 %define alt_kernel 4.14 @@ -30,7 +30,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: bacdb9ffdcd922aa069a5e1520160e24 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Source1-md5: 9e2b229ed302e449f4aefa6db8b499b1 +# Source1-md5: 2da74715bdda931c40d802cecf3f8410 %endif Source2: kernel-module-build.pl -- 2.46.0