linux-essential-mata: enable CONFIG_USER_NS (MR 1411)

device/testing/linux-essential-mata/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=linux-essential-mata
 pkgver=4.4.227
-pkgrel=0
+pkgrel=1
 pkgdesc="Essential PH1 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -50,7 +50,7 @@ package() {
 }
 
 sha512sums="7d0d937c3482eaf2e30f5de29b62398201203d29674003980774d227896343d870e6f0f821a78489d7d5d76ce11d9d002e84ea471a72f193c5fc9b2b90c6173c  linux-essential-mata-d13a367745bb75601f7346d4d9d7525a6ca6e332.tar.gz
-5514bf222f85a3d6f7f26732c6e4c350cefa49a000fb320a61a27d3f1dc9c455beba07f82f8fd53b3e7fa79b5862e09437c98299645b2ae36da415d1f737abc5  config-essential-mata.aarch64
+5af3f89575b1d0be4ee8a60056921c5f3dd9044282e4a0c8eb17d68076f6c092557608b55fc91a1afd59c3c93802bbbb1cf2e825dfbf585d5997997e2847aff7  config-essential-mata.aarch64
 f41ccfd64f3d9f6a467048420d4c9e17ff512f6cd8d1fd521a758dc80bef2dfab559b740e7dc2d0bbb49855359556d4fb6ec5c00892f3f6850f3b8785c195219  cc-option_wrapper_Wno-frame-larger.patch
 bb9adbcd1df17f9197a9d66bacd0103164182ff3813a3b346128c88244135f40de3c3c7c6dd9391df47d9dccd5fd35ffcc248e0abae51214d09a2f5e7d960c31  f_fs_module_inittest.patch
 1a8cb6ed2cc9b81815160ec990c16385cbe94d71e1607c5968c24a5fa653128fc3e25dfdac861b03faa163d612251814d4c59f4c083258c0d9964c74504c462d  0001-Revert-tty-check-before-stopping-kthread.patch

device/testing/linux-essential-mata/config-essential-mata.aarch64

@@ -148,10 +148,10 @@ CONFIG_BLK_CGROUP=y
 # CONFIG_SCHED_CORE_CTL is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
+CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_TUNE=y
@@ -3346,23 +3346,8 @@ CONFIG_USB_F_CDEV=y
 CONFIG_USB_F_CCID=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_SERIAL=y
-<<<<<<< HEAD
-<<<<<<< HEAD
 # CONFIG_USB_CONFIGFS_ACM is not set
-<<<<<<< HEAD
-=======
-#CONFIG_USB_CONFIGFS_ACM=y
->>>>>>> 11e2f9d9... Upload New File
-=======
-# CONFIG_USB_CONFIGFS_ACM is not set
->>>>>>> d9d69afe... Update config-essential-mata.aarch64
-=======
-<<<<<<< HEAD
->>>>>>> d90bb4b2... Rebase onto local master
-#CONFIG_USB_CONFIGFS_OBEX=y 
-=======
 # CONFIG_USB_CONFIGFS_OBEX is not set
->>>>>>> 4fae5682... Update kernel version
 CONFIG_USB_CONFIGFS_NCM=y
 # CONFIG_USB_CONFIGFS_ECM is not set
 # CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
@@ -4414,15 +4399,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-<<<<<<< HEAD
-<<<<<<< HEAD
-CONFIG_CONFIGFS_FS=m
-=======
 CONFIG_CONFIGFS_FS=y
->>>>>>> 11e2f9d9... Upload New File
-=======
-CONFIG_CONFIGFS_FS=m
->>>>>>> f60a4f17... Update config-essential-mata.aarch64
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set