diff --git a/AGNi_version.sh b/AGNi_version.sh
index 87f49707d8ff..d948c2a97a50 100755
--- a/AGNi_version.sh
+++ b/AGNi_version.sh
@@ -4,9 +4,9 @@
 KERNELDIR=`readlink -f .`
 
 export AGNI_VERSION_PREFIX="stable"
-export AGNI_VERSION="v3.5"
-sed -i 's/5.4.246/5.4.247/' $KERNELDIR/arch/arm64/configs/agni_*
-sed -i 's/v3.4-stable/v3.5-stable/' $KERNELDIR/arch/arm64/configs/agni_*
+export AGNI_VERSION="v3.6"
+sed -i 's/5.4.247/5.4.248/' $KERNELDIR/arch/arm64/configs/agni_*
+sed -i 's/v3.5-stable/v3.6-stable/' $KERNELDIR/arch/arm64/configs/agni_*
 
 echo "	AGNi Version info loaded."
 
diff --git a/Makefile b/Makefile
index 52a9362782fe..90411ffcb5b9 100644
--- a/Makefile
+++ b/Makefile
@@ -749,11 +749,11 @@ KBUILD_CFLAGS  += $(call cc-option, -Wno-deprecated-declarations)
 KBUILD_CPPFLAGS  += $(call cc-option, -Wno-deprecated-declarations)
 
 ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
-KBUILD_CFLAGS += -O2
+KBUILD_CFLAGS += -O2 -ffast-math
 else ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3
 KBUILD_CFLAGS += -O3
 else ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
-KBUILD_CFLAGS += -Os
+KBUILD_CFLAGS += -Os -ffast-math
 endif
 
 # Tell compiler to tune the performance of the code for a specified
@@ -762,8 +762,8 @@ ifeq ($(cc-name),gcc)
 KBUILD_CFLAGS += -mcpu=cortex-a78.cortex-a55 -march=armv8.4-a+crc+crypto
 KBUILD_AFLAGS += -mcpu=cortex-a78.cortex-a55 -march=armv8.4-a+crc+crypto
 else ifeq ($(cc-name),clang)
-KBUILD_CFLAGS += -mcpu=cortex-a55 -march=armv8.4-a+crc+crypto
-KBUILD_AFLAGS += -mcpu=cortex-a55 -march=armv8.4-a+crc+crypto
+KBUILD_CFLAGS += -mcpu=kryo -march=armv8.4-a+crc+crypto+aes+lse+sha3
+KBUILD_AFLAGS += -mcpu=kryo -march=armv8.4-a+crc+crypto+aes+lse+sha3
 endif
 
 # Tell gcc to never replace conditional load with a non-conditional one
diff --git a/android/abi_gki_aarch64_agni.xml b/android/abi_gki_aarch64_agni.xml
index 00351e87cba2..62849b382e35 100644
--- a/android/abi_gki_aarch64_agni.xml
+++ b/android/abi_gki_aarch64_agni.xml
@@ -2,8 +2,6 @@
   <abi-corpus version='2.1' path='vmlinux' architecture='elf-arm-aarch64'>
     <elf-function-symbols>
       <elf-symbol name='I_BDEV' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2b80309b'/>
-      <elf-symbol name='LZ4_compress_HC' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xddf86133'/>
-      <elf-symbol name='LZ4_compress_HC_continue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x38f7b6e0'/>
       <elf-symbol name='LZ4_compress_default' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4f4d78c5'/>
       <elf-symbol name='LZ4_compress_destSize' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5bc92e85'/>
       <elf-symbol name='LZ4_compress_fast' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6004858d'/>
@@ -16,9 +14,7 @@
       <elf-symbol name='LZ4_decompress_safe_partial' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x15bed7a5'/>
       <elf-symbol name='LZ4_decompress_safe_usingDict' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8b0088d1'/>
       <elf-symbol name='LZ4_loadDict' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x749849d8'/>
-      <elf-symbol name='LZ4_loadDictHC' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x93ff008c'/>
       <elf-symbol name='LZ4_saveDict' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x635ff76d'/>
-      <elf-symbol name='LZ4_saveDictHC' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9cef495b'/>
       <elf-symbol name='LZ4_setStreamDecode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3b321462'/>
       <elf-symbol name='PDE_DATA' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd21a343e'/>
       <elf-symbol name='PageMovable' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x916d54fb'/>
@@ -7625,7 +7621,6 @@
       <elf-symbol name='neigh_for_each' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3d20e2bf'/>
       <elf-symbol name='neigh_ifdown' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcf897cf3'/>
       <elf-symbol name='neigh_lookup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x50df858e'/>
-      <elf-symbol name='neigh_lookup_nodev' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2cd1ddf5'/>
       <elf-symbol name='neigh_parms_alloc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2563a82a'/>
       <elf-symbol name='neigh_parms_release' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3d4ea8c7'/>
       <elf-symbol name='neigh_proc_dointvec' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x60b3071f'/>
@@ -15018,8 +15013,6 @@
   <abi-corpus version='2.1' path='vmlinux' architecture='elf-arm-aarch64'>
     <elf-function-symbols>
       <elf-symbol name='I_BDEV' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2b80309b'/>
-      <elf-symbol name='LZ4_compress_HC' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xddf86133'/>
-      <elf-symbol name='LZ4_compress_HC_continue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x38f7b6e0'/>
       <elf-symbol name='LZ4_compress_default' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4f4d78c5'/>
       <elf-symbol name='LZ4_compress_destSize' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5bc92e85'/>
       <elf-symbol name='LZ4_compress_fast' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6004858d'/>
@@ -15032,9 +15025,7 @@
       <elf-symbol name='LZ4_decompress_safe_partial' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x15bed7a5'/>
       <elf-symbol name='LZ4_decompress_safe_usingDict' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8b0088d1'/>
       <elf-symbol name='LZ4_loadDict' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x749849d8'/>
-      <elf-symbol name='LZ4_loadDictHC' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x93ff008c'/>
       <elf-symbol name='LZ4_saveDict' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x635ff76d'/>
-      <elf-symbol name='LZ4_saveDictHC' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9cef495b'/>
       <elf-symbol name='LZ4_setStreamDecode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3b321462'/>
       <elf-symbol name='PDE_DATA' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd21a343e'/>
       <elf-symbol name='PageMovable' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x916d54fb'/>
@@ -22641,7 +22632,6 @@
       <elf-symbol name='neigh_for_each' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3d20e2bf'/>
       <elf-symbol name='neigh_ifdown' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcf897cf3'/>
       <elf-symbol name='neigh_lookup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x50df858e'/>
-      <elf-symbol name='neigh_lookup_nodev' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2cd1ddf5'/>
       <elf-symbol name='neigh_parms_alloc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2563a82a'/>
       <elf-symbol name='neigh_parms_release' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3d4ea8c7'/>
       <elf-symbol name='neigh_proc_dointvec' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x60b3071f'/>
diff --git a/arch/arm64/configs/agni_haydn_defconfig b/arch/arm64/configs/agni_haydn_defconfig
index 781d0fb464c5..995b4cc2482b 100644
--- a/arch/arm64/configs/agni_haydn_defconfig
+++ b/arch/arm64/configs/agni_haydn_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.247 Kernel Configuration
+# Linux/arm64 5.4.248 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="clang version 14.1.4"
 CONFIG_GCC_VERSION=0
@@ -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_MIUI-ST_v3.5-stable-qgki"
+CONFIG_LOCALVERSION="-AGNi_haydn_MIUI-ST_v3.6-stable-qgki"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_HOSTNAME="haydn"
@@ -1326,7 +1326,6 @@ CONFIG_HYFI_BRIDGE_HOOKS=y
 CONFIG_HAVE_NET_DSA=y
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
 CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
@@ -6591,7 +6590,7 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZ4HC=y
+# CONFIG_CRYPTO_LZ4HC is not set
 CONFIG_CRYPTO_ZSTD=y
 
 #
@@ -6703,7 +6702,6 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y