The Avila project

Merge ~vicamo/avila/+git/kernel-3.10:xenial-snappy/systemd-features into ~phablet-team/avila/+git/kernel-3.10:ubuntu

  1. Git
  2. lp:~vicamo/avila/+git/kernel-3.10
  3. xenial-snappy/systemd-features
  4. Merge into ubuntu
Proposed by You-Sheng Yang
Status: Superseded
Proposed branch: ~vicamo/avila/+git/kernel-3.10:xenial-snappy/systemd-features
Merge into: ~phablet-team/avila/+git/kernel-3.10:ubuntu
Diff against target: 98 lines (+14/-12)
2 files modified
arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig (+7/-6)
arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig (+7/-6)
Reviewer Review Type Date Requested Status
You-Sheng Yang (community) Disapprove
Review via email: mp+306307@code.launchpad.net

This proposal has been superseded by a proposal from 2016-09-22.

Description of the change

enable features for systemd

Bug: https://bugs.launchpad.net/avila-private/xenial64/+bug/1625422

To post a comment you must log in.
Revision history for this message
You-Sheng Yang (vicamo) wrote :

This mp targets the ubuntu branch, which may affect current vivid/upstart based devices so should NOT really merge. Maybe we need another new branch for this.

review: Disapprove
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Please propose against xenial branch, as discussed. xenial+upstart is not affected adversely by these changes.

Unmerged commits

edcc346... by You-Sheng Yang

enable features for systemd

Bug: https://bugs.launchpad.net/avila-private/xenial64/+bug/1625422

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig
index 110ff4e..8df706d 100755
--- a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig
+++ b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig
@@ -105,10 +105,10 @@ CONFIG_CGROUP_CPUACCT=y
105# CONFIG_CGROUP_PERF is not set105# CONFIG_CGROUP_PERF is not set
106CONFIG_CGROUP_SCHED=y106CONFIG_CGROUP_SCHED=y
107CONFIG_FAIR_GROUP_SCHED=y107CONFIG_FAIR_GROUP_SCHED=y
108# CONFIG_CFS_BANDWIDTH is not set108CONFIG_CFS_BANDWIDTH=y
109CONFIG_RT_GROUP_SCHED=n109CONFIG_RT_GROUP_SCHED=n
110# CONFIG_BLK_CGROUP is not set110# CONFIG_BLK_CGROUP is not set
111# CONFIG_CHECKPOINT_RESTORE is not set111CONFIG_CHECKPOINT_RESTORE=y
112CONFIG_NAMESPACES=y112CONFIG_NAMESPACES=y
113CONFIG_UTS_NS=y113CONFIG_UTS_NS=y
114CONFIG_IPC_NS=y114CONFIG_IPC_NS=y
@@ -2859,9 +2859,10 @@ CONFIG_QUOTA_TREE=y
2859# CONFIG_QFMT_V1 is not set2859# CONFIG_QFMT_V1 is not set
2860CONFIG_QFMT_V2=y2860CONFIG_QFMT_V2=y
2861CONFIG_QUOTACTL=y2861CONFIG_QUOTACTL=y
2862# CONFIG_AUTOFS4_FS is not set2862CONFIG_AUTOFS4_FS=y
2863CONFIG_FUSE_FS=y2863CONFIG_FUSE_FS=y
2864# CONFIG_CUSE is not set2864# CONFIG_CUSE is not set
2865CONFIG_GENERIC_ACL=y
28652866
2866#2867#
2867# Caches2868# Caches
@@ -2895,8 +2896,8 @@ CONFIG_PROC_SYSCTL=y
2895CONFIG_PROC_PAGE_MONITOR=y2896CONFIG_PROC_PAGE_MONITOR=y
2896CONFIG_SYSFS=y2897CONFIG_SYSFS=y
2897CONFIG_TMPFS=y2898CONFIG_TMPFS=y
2898# CONFIG_TMPFS_POSIX_ACL is not set2899CONFIG_TMPFS_POSIX_ACL=y
2899# CONFIG_TMPFS_XATTR is not set2900CONFIG_TMPFS_XATTR=y
2900# CONFIG_HUGETLB_PAGE is not set2901# CONFIG_HUGETLB_PAGE is not set
2901CONFIG_CONFIGFS_FS=y2902CONFIG_CONFIGFS_FS=y
2902CONFIG_MISC_FILESYSTEMS=y2903CONFIG_MISC_FILESYSTEMS=y
@@ -3122,7 +3123,7 @@ CONFIG_SECURITYFS=y
3122CONFIG_SECURITY_NETWORK=y3123CONFIG_SECURITY_NETWORK=y
3123# CONFIG_SECURITY_NETWORK_XFRM is not set3124# CONFIG_SECURITY_NETWORK_XFRM is not set
3124CONFIG_SECURITY_PATH=y3125CONFIG_SECURITY_PATH=y
3125CONFIG_LSM_MMAP_MIN_ADDR=327683126CONFIG_LSM_MMAP_MIN_ADDR=0
3126CONFIG_SECURITY_SELINUX=y3127CONFIG_SECURITY_SELINUX=y
3127CONFIG_SECURITY_SELINUX_BOOTPARAM=y3128CONFIG_SECURITY_SELINUX_BOOTPARAM=y
3128CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=03129CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff --git a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig
index e693b8a..806630e 100755
--- a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig
+++ b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig
@@ -104,10 +104,10 @@ CONFIG_CGROUP_CPUACCT=y
104# CONFIG_RESOURCE_COUNTERS is not set104# CONFIG_RESOURCE_COUNTERS is not set
105CONFIG_CGROUP_SCHED=y105CONFIG_CGROUP_SCHED=y
106CONFIG_FAIR_GROUP_SCHED=y106CONFIG_FAIR_GROUP_SCHED=y
107# CONFIG_CFS_BANDWIDTH is not set107CONFIG_CFS_BANDWIDTH=y
108CONFIG_RT_GROUP_SCHED=n108CONFIG_RT_GROUP_SCHED=n
109# CONFIG_BLK_CGROUP is not set109# CONFIG_BLK_CGROUP is not set
110# CONFIG_CHECKPOINT_RESTORE is not set110CONFIG_CHECKPOINT_RESTORE=y
111CONFIG_NAMESPACES=y111CONFIG_NAMESPACES=y
112CONFIG_UTS_NS=y112CONFIG_UTS_NS=y
113CONFIG_IPC_NS=y113CONFIG_IPC_NS=y
@@ -2851,9 +2851,10 @@ CONFIG_QUOTA_TREE=y
2851# CONFIG_QFMT_V1 is not set2851# CONFIG_QFMT_V1 is not set
2852CONFIG_QFMT_V2=y2852CONFIG_QFMT_V2=y
2853CONFIG_QUOTACTL=y2853CONFIG_QUOTACTL=y
2854# CONFIG_AUTOFS4_FS is not set2854CONFIG_AUTOFS4_FS=y
2855CONFIG_FUSE_FS=y2855CONFIG_FUSE_FS=y
2856# CONFIG_CUSE is not set2856# CONFIG_CUSE is not set
2857CONFIG_GENERIC_ACL=y
28572858
2858#2859#
2859# Caches2860# Caches
@@ -2887,8 +2888,8 @@ CONFIG_PROC_SYSCTL=y
2887CONFIG_PROC_PAGE_MONITOR=y2888CONFIG_PROC_PAGE_MONITOR=y
2888CONFIG_SYSFS=y2889CONFIG_SYSFS=y
2889CONFIG_TMPFS=y2890CONFIG_TMPFS=y
2890# CONFIG_TMPFS_POSIX_ACL is not set2891CONFIG_TMPFS_POSIX_ACL=y
2891# CONFIG_TMPFS_XATTR is not set2892CONFIG_TMPFS_XATTR=y
2892# CONFIG_HUGETLB_PAGE is not set2893# CONFIG_HUGETLB_PAGE is not set
2893CONFIG_CONFIGFS_FS=y2894CONFIG_CONFIGFS_FS=y
2894CONFIG_MISC_FILESYSTEMS=y2895CONFIG_MISC_FILESYSTEMS=y
@@ -3104,7 +3105,7 @@ CONFIG_SECURITYFS=y
3104CONFIG_SECURITY_NETWORK=y3105CONFIG_SECURITY_NETWORK=y
3105# CONFIG_SECURITY_NETWORK_XFRM is not set3106# CONFIG_SECURITY_NETWORK_XFRM is not set
3106CONFIG_SECURITY_PATH=y3107CONFIG_SECURITY_PATH=y
3107CONFIG_LSM_MMAP_MIN_ADDR=327683108CONFIG_LSM_MMAP_MIN_ADDR=0
3108CONFIG_SECURITY_SELINUX=y3109CONFIG_SECURITY_SELINUX=y
3109CONFIG_SECURITY_SELINUX_BOOTPARAM=y3110CONFIG_SECURITY_SELINUX_BOOTPARAM=y
3110CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=03111CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

Subscribers

People subscribed via source and target branches