diff --git a/AGNi_version.sh b/AGNi_version.sh
index 860c422d947b..2a556480338d 100755
--- a/AGNi_version.sh
+++ b/AGNi_version.sh
@@ -4,9 +4,9 @@
 KERNELDIR=`readlink -f .`
 
 export AGNI_VERSION_PREFIX="stable"
-export AGNI_VERSION="v6.3"
+export AGNI_VERSION="v6.4"
 sed -i 's/5.4.275/5.4.277/' $KERNELDIR/arch/arm64/configs/agni_*
-sed -i 's/v6.2-stable/v6.3-stable/' $KERNELDIR/arch/arm64/configs/agni_*
+sed -i 's/v6.3-stable/v6.4-stable/' $KERNELDIR/arch/arm64/configs/agni_*
 
 echo "	AGNi Version info loaded."
 
diff --git a/Makefile b/Makefile
index 471001946061..9eabed33a170 100644
--- a/Makefile
+++ b/Makefile
@@ -756,6 +756,8 @@ KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)
 KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
 KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)
 KBUILD_CFLAGS	+= $(call cc-disable-warning, unknown-warning-option)
+KBUILD_CFLAGS   += $(call cc-disable-warning, enum-conversion)
+KBUILD_CFLAGS   += $(call cc-disable-warning, single-bit-bitfield-constant-conversion)
 KBUILD_CFLAGS  += $(call cc-option, -Wno-format)
 KBUILD_CFLAGS  += $(call cc-option, -Wno-maybe-uninitialized)
 KBUILD_CFLAGS  += $(call cc-option, -Wno-psabi)
diff --git a/arch/arm64/configs/agni_haydn_defconfig b/arch/arm64/configs/agni_haydn_defconfig
index df96f1e65fe7..1c72ec14bc7b 100644
--- a/arch/arm64/configs/agni_haydn_defconfig
+++ b/arch/arm64/configs/agni_haydn_defconfig
@@ -2,11 +2,11 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.4.277 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="clang version 14.1.4"
+CONFIG_CC_VERSION_TEXT="clang version 18.0.0"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
 CONFIG_LD_IS_LLD=y
-CONFIG_CLANG_VERSION=140104
+CONFIG_CLANG_VERSION=180000
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-AGNi_haydn_HyperOS_v6.3-stable-qgki"
+CONFIG_LOCALVERSION="-AGNi_haydn_HyperOS_v6.4-stable-qgki"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_HOSTNAME="haydn"
@@ -6486,7 +6486,7 @@ CONFIG_LSM="selinux"
 # Memory initialization
 #
 CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
 CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 # CONFIG_INIT_STACK_NONE is not set
 # CONFIG_INIT_STACK_ALL_PATTERN is not set