From 22367767874385ad778f5fccbfc11d92b6f04f15 Mon Sep 17 00:00:00 2001 From: Khusika Dhamar Gusti Date: Tue, 29 Oct 2019 15:43:41 +0700 Subject: [PATCH] canting-4.9-q: Bring it up to 2.9 *Add missing configs required by Q Change-Id: I5e1ace28e1ed4286e645ec8189d24bc4cd10dcb2 Signed-off-by: Khusika Dhamar Gusti --- arch/arm64/configs/canting-beryllium_defconfig | 15 +++++++-------- arch/arm64/configs/canting-dipper_defconfig | 15 +++++++-------- arch/arm64/configs/canting-polaris_defconfig | 15 +++++++-------- arch/arm64/configs/canting-ursa_defconfig | 15 +++++++-------- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/arch/arm64/configs/canting-beryllium_defconfig b/arch/arm64/configs/canting-beryllium_defconfig index c57eafc12a4b..4c6d5fbb6669 100644 --- a/arch/arm64/configs/canting-beryllium_defconfig +++ b/arch/arm64/configs/canting-beryllium_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.197 Kernel Configuration +# Linux/arm64 4.9.198 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Canting-2.8" +CONFIG_LOCALVERSION="-Canting-2.9" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -202,7 +202,7 @@ CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y -# CONFIG_MEMBARRIER is not set +CONFIG_MEMBARRIER=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y @@ -535,7 +535,7 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_SW_TTBR0_PAN=y # # ARMv8.1 architectural features @@ -677,7 +677,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_ALGO=y CONFIG_XFRM_USER=y -# CONFIG_XFRM_INTERFACE is not set +CONFIG_XFRM_INTERFACE=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set CONFIG_XFRM_STATISTICS=y @@ -1080,7 +1080,7 @@ CONFIG_NET_CLS_U32=y # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_CGROUP is not set -# CONFIG_NET_CLS_BPF is not set +CONFIG_NET_CLS_BPF=y # CONFIG_NET_CLS_FLOWER is not set # CONFIG_NET_CLS_MATCHALL is not set CONFIG_NET_EMATCH=y @@ -1535,7 +1535,7 @@ CONFIG_DM_VERITY_FEC=y # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set -# CONFIG_DM_BOW is not set +CONFIG_DM_BOW=y # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -3708,7 +3708,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/arch/arm64/configs/canting-dipper_defconfig b/arch/arm64/configs/canting-dipper_defconfig index e88a9666213b..6496e23f9124 100644 --- a/arch/arm64/configs/canting-dipper_defconfig +++ b/arch/arm64/configs/canting-dipper_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.197 Kernel Configuration +# Linux/arm64 4.9.198 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Canting-2.8" +CONFIG_LOCALVERSION="-Canting-2.9" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -202,7 +202,7 @@ CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y -# CONFIG_MEMBARRIER is not set +CONFIG_MEMBARRIER=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y @@ -535,7 +535,7 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_SW_TTBR0_PAN=y # # ARMv8.1 architectural features @@ -677,7 +677,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_ALGO=y CONFIG_XFRM_USER=y -# CONFIG_XFRM_INTERFACE is not set +CONFIG_XFRM_INTERFACE=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set CONFIG_XFRM_STATISTICS=y @@ -1080,7 +1080,7 @@ CONFIG_NET_CLS_U32=y # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_CGROUP is not set -# CONFIG_NET_CLS_BPF is not set +CONFIG_NET_CLS_BPF=y # CONFIG_NET_CLS_FLOWER is not set # CONFIG_NET_CLS_MATCHALL is not set CONFIG_NET_EMATCH=y @@ -1535,7 +1535,7 @@ CONFIG_DM_VERITY_FEC=y # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set -# CONFIG_DM_BOW is not set +CONFIG_DM_BOW=y # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -3716,7 +3716,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/arch/arm64/configs/canting-polaris_defconfig b/arch/arm64/configs/canting-polaris_defconfig index 996278da1299..0584ec10c5eb 100644 --- a/arch/arm64/configs/canting-polaris_defconfig +++ b/arch/arm64/configs/canting-polaris_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.197 Kernel Configuration +# Linux/arm64 4.9.198 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Canting-2.8" +CONFIG_LOCALVERSION="-Canting-2.9" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -202,7 +202,7 @@ CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y -# CONFIG_MEMBARRIER is not set +CONFIG_MEMBARRIER=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y @@ -535,7 +535,7 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_SW_TTBR0_PAN=y # # ARMv8.1 architectural features @@ -677,7 +677,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_ALGO=y CONFIG_XFRM_USER=y -# CONFIG_XFRM_INTERFACE is not set +CONFIG_XFRM_INTERFACE=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set CONFIG_XFRM_STATISTICS=y @@ -1080,7 +1080,7 @@ CONFIG_NET_CLS_U32=y # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_CGROUP is not set -# CONFIG_NET_CLS_BPF is not set +CONFIG_NET_CLS_BPF=y # CONFIG_NET_CLS_FLOWER is not set # CONFIG_NET_CLS_MATCHALL is not set CONFIG_NET_EMATCH=y @@ -1535,7 +1535,7 @@ CONFIG_DM_VERITY_FEC=y # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set -# CONFIG_DM_BOW is not set +CONFIG_DM_BOW=y # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -3717,7 +3717,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/arch/arm64/configs/canting-ursa_defconfig b/arch/arm64/configs/canting-ursa_defconfig index 78f5f5e9cf73..42aea884cd33 100644 --- a/arch/arm64/configs/canting-ursa_defconfig +++ b/arch/arm64/configs/canting-ursa_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.197 Kernel Configuration +# Linux/arm64 4.9.198 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Canting-2.8" +CONFIG_LOCALVERSION="-Canting-2.9" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -202,7 +202,7 @@ CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y # CONFIG_USERFAULTFD is not set CONFIG_PCI_QUIRKS=y -# CONFIG_MEMBARRIER is not set +CONFIG_MEMBARRIER=y CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y @@ -535,7 +535,7 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_SW_TTBR0_PAN=y # # ARMv8.1 architectural features @@ -677,7 +677,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_ALGO=y CONFIG_XFRM_USER=y -# CONFIG_XFRM_INTERFACE is not set +CONFIG_XFRM_INTERFACE=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set CONFIG_XFRM_STATISTICS=y @@ -1080,7 +1080,7 @@ CONFIG_NET_CLS_U32=y # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_CGROUP is not set -# CONFIG_NET_CLS_BPF is not set +CONFIG_NET_CLS_BPF=y # CONFIG_NET_CLS_FLOWER is not set # CONFIG_NET_CLS_MATCHALL is not set CONFIG_NET_EMATCH=y @@ -1535,7 +1535,7 @@ CONFIG_DM_VERITY_FEC=y # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set -# CONFIG_DM_BOW is not set +CONFIG_DM_BOW=y # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -3717,7 +3717,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set