diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-10 19:59:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-10 19:59:16 +0000 |
| commit | 8f7fecc875186306cd1fbe2737aa772d4dd3a2cc (patch) | |
| tree | b320bc0b87c02ae0be1d5848487283bbbaad1ebe | |
| parent | d1348384b796d49542b2f92074ce4ef80cd8c33f (diff) | |
| parent | a105170542241614d968503349bad736fff61113 (diff) | |
| download | configs-8f7fecc875186306cd1fbe2737aa772d4dd3a2cc.tar.gz | |
Merge "Require XFRM_MIGRATE for S devices" am: fe1278e640 am: a105170542
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1529201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e6ced0f0d6b8f5c8103356722bf4a0ed07f7cfd
| -rw-r--r-- | android-4.19/android-base.config | 1 | ||||
| -rw-r--r-- | android-5.10/android-base.config | 1 | ||||
| -rw-r--r-- | android-5.4/android-base.config | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config index 99d1a2d..2ab90dc 100644 --- a/android-4.19/android-base.config +++ b/android-4.19/android-base.config @@ -255,5 +255,6 @@ CONFIG_USB_SUPPORT=y CONFIG_UTS_NS=y CONFIG_VETH=y CONFIG_XFRM_INTERFACE=y +CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_USER=y diff --git a/android-5.10/android-base.config b/android-5.10/android-base.config index 430775a..59a0606 100644 --- a/android-5.10/android-base.config +++ b/android-5.10/android-base.config @@ -251,5 +251,6 @@ CONFIG_USB_SUPPORT=y CONFIG_UTS_NS=y CONFIG_VETH=y CONFIG_XFRM_INTERFACE=y +CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_USER=y diff --git a/android-5.4/android-base.config b/android-5.4/android-base.config index 430775a..59a0606 100644 --- a/android-5.4/android-base.config +++ b/android-5.4/android-base.config @@ -251,5 +251,6 @@ CONFIG_USB_SUPPORT=y CONFIG_UTS_NS=y CONFIG_VETH=y CONFIG_XFRM_INTERFACE=y +CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_USER=y |