From 32017e691312d96dfe2c9f455521b90712da9bae Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 01:25:11 +0100
Subject: [PATCH] update to 4.14.60 [release 4.14.60-1mamba;Fri Aug 03 2018]

---
 ...arm-config => kernel-4.14.60-mamba-arm-config | 16 ++++++----------
 kernel.spec                                      | 10 ++++++++--
 2 files changed, 14 insertions(+), 12 deletions(-)
 rename kernel-4.14.29-mamba-arm-config => kernel-4.14.60-mamba-arm-config (99%)

diff --git a/kernel-4.14.29-mamba-arm-config b/kernel-4.14.60-mamba-arm-config
similarity index 99%
rename from kernel-4.14.29-mamba-arm-config
rename to kernel-4.14.60-mamba-arm-config
index 5a69d9b..cf0994b 100644
--- a/kernel-4.14.29-mamba-arm-config
+++ b/kernel-4.14.60-mamba-arm-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.29 Kernel Configuration
+# Linux/arm 4.14.60mamba-arm Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -253,11 +253,7 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
-CONFIG_GCC_PLUGIN_RANDSTRUCT=y
-CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
@@ -1572,6 +1568,9 @@ CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1579,10 +1578,7 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -7942,7 +7938,6 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 CONFIG_SW_SYNC=y
 CONFIG_AUXDISPLAY=y
-CONFIG_CHARLCD=m
 CONFIG_HD44780=m
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -7954,6 +7949,7 @@ CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m
diff --git a/kernel.spec b/kernel.spec
index c7fa54c..a01fb68 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -74,7 +74,7 @@
 %define _use_internal_dependency_generator 1
 
 Name:          kernel
-Version:       4.14.31
+Version:       4.14.60
 Release:       1mamba
 Summary:       The Linux Kernel, the operating system core itself
 Group:         System/Kernel and Hardware
@@ -94,7 +94,7 @@ Source9:       %{name}-custom-i586-config
 Source11:      %{name}-%{kernel_majver}.31-mamba-config
 Source12:      %{name}-%{kernel_majver}.29-mamba-x86_64-config
 Source13:      %{name}-%{kernel_majver}.31-mamba-64GB-config
-Source15:      %{name}-%{kernel_majver}.29-mamba-arm-config
+Source15:      %{name}-%{kernel_majver}.60-mamba-arm-config
 Source20:      %{name}-%{kernel_majver}-mamba-arm-dove-config
 Patch0:        kernel-2.6.35-430-scsi_header_fix.patch
 # Ingo Molnar's RT patch
@@ -742,6 +742,12 @@ exit 0
 #/lib/firmware/*
 
 %changelog
+* Fri Aug 03 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.60-1mamba
+- update to 4.14.60
+
+* Fri Jul 27 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.58-1mamba
+- update to 4.14.58
+
 * Sat Mar 31 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.31-1mamba
 - update to 4.14.31
 - mamba, mamba-64GB: unset CONFIG_GCC_PLUGIN_RANDSTRUCT and CONFIG_OF_UNITTEST