updated with main branch

fixed haptic feedback

Author: Mainak009

arch/arm64/configs/santoni_neternels_defconfig

@@ -671,8 +671,6 @@ CONFIG_NET_KEY=y
 CONFIG_INET=y
 CONFIG_WIREGUARD=y
 # CONFIG_WIREGUARD_DEBUG is not set
-=======
->>>>>>> 3d9a5d636f6f67faab1d5f895335722995209d04
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_IP_FIB_TRIE_STATS is not set
@@ -1447,7 +1445,6 @@ CONFIG_DM_BUFIO=y
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_CRYPT=y
 CONFIG_DM_REQ_CRYPT=y
-CONFIG_DM_DEFAULT_KEY=y
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_THIN_PROVISIONING is not set
 # CONFIG_DM_CACHE is not set