merged defconfig

arch/arm64/configs/jd2019_defconfig

@@ -2,13 +2,8 @@ CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_LOCALVERSION="-limitless"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_KERNEL_LZ4=y
-<<<<<<< HEAD
-CONFIG_SYSVIPC=y
-||||||| acdf64a69516
-=======
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
->>>>>>> 011e6a4260ccf5abecec3488009accb8ea0dc650
 # CONFIG_FHANDLE is not set
 CONFIG_AUDIT=y
 # CONFIG_AUDITSYSCALL is not set
@@ -35,9 +30,7 @@ CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_BPF=y
 CONFIG_SCHED_CORE_CTL=y
 CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
 CONFIG_USER_NS=y
-CONFIG_PID_NS=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_TUNE=y
 CONFIG_DEFAULT_USE_ENERGY_AWARE=y
@@ -442,6 +435,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_MSM=y