The Avila project

Merge ~chunsang/avila/+git/kernel-3.10:xenial into ~phablet-team/avila/+git/kernel-3.10:xenial

  1. Git
  2. lp:~chunsang/avila/+git/kernel-3.10
  3. xenial
  4. Merge into xenial
Proposed by Chunsang Jeong
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 67d3c47f405fa411786788b30f85b02acaa07e52
Merged at revision: 67d3c47f405fa411786788b30f85b02acaa07e52
Proposed branch: ~chunsang/avila/+git/kernel-3.10:xenial
Merge into: ~phablet-team/avila/+git/kernel-3.10:xenial
Diff against target: 307 lines (+62/-40)
2 files modified
arch/arm64/configs/bq_aquaris_m10_ubuntu_debug_defconfig (+31/-20)
arch/arm64/configs/bq_aquaris_m10_ubuntu_defconfig (+31/-20)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Ubuntu Phablet Team Pending
Review via email: mp+313101@code.launchpad.net

Description of the change

    Enable systemd and snappy features for cooler arm64

    It includes the previous patches to enable systemd and snappy
     edcc34677864b628b45c9f26f433c55e318c26d9
     ca0572baeba97bd9e92984a421a23fd20f8794da

    Signed-off-by: Chunsang Jeong <email address hidden>

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/arch/arm64/configs/bq_aquaris_m10_ubuntu_debug_defconfig b/arch/arm64/configs/bq_aquaris_m10_ubuntu_debug_defconfig
2index ef10fa9..537a2e7 100755
3--- a/arch/arm64/configs/bq_aquaris_m10_ubuntu_debug_defconfig
4+++ b/arch/arm64/configs/bq_aquaris_m10_ubuntu_debug_defconfig
5@@ -40,7 +40,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
6 CONFIG_SWAP=y
7 CONFIG_SYSVIPC=y
8 CONFIG_SYSVIPC_SYSCTL=y
9-# CONFIG_POSIX_MQUEUE is not set
10+CONFIG_POSIX_MQUEUE=y
11+CONFIG_POSIX_MQUEUE_SYSCTL=y
12 CONFIG_FHANDLE=y
13 CONFIG_AUDIT=y
14 # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
15@@ -98,17 +99,18 @@ CONFIG_GENERIC_SCHED_CLOCK=y
16 CONFIG_CGROUPS=y
17 # CONFIG_CGROUP_DEBUG is not set
18 CONFIG_CGROUP_FREEZER=y
19-# CONFIG_CGROUP_DEVICE is not set
20-# CONFIG_CPUSETS is not set
21+CONFIG_CGROUP_DEVICE=y
22+CONFIG_CPUSETS=y
23+CONFIG_PROC_PID_CPUSET=y
24 CONFIG_CGROUP_CPUACCT=y
25 # CONFIG_RESOURCE_COUNTERS is not set
26 # CONFIG_CGROUP_PERF is not set
27 CONFIG_CGROUP_SCHED=y
28 CONFIG_FAIR_GROUP_SCHED=y
29-# CONFIG_CFS_BANDWIDTH is not set
30+CONFIG_CFS_BANDWIDTH=y
31 CONFIG_RT_GROUP_SCHED=n
32 # CONFIG_BLK_CGROUP is not set
33-# CONFIG_CHECKPOINT_RESTORE is not set
34+CONFIG_CHECKPOINT_RESTORE=y
35 CONFIG_NAMESPACES=y
36 CONFIG_UTS_NS=y
37 CONFIG_IPC_NS=y
38@@ -123,9 +125,9 @@ CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
39 CONFIG_BLK_DEV_INITRD=y
40 CONFIG_INITRAMFS_SOURCE=""
41 CONFIG_RD_GZIP=y
42-# CONFIG_RD_BZIP2 is not set
43-# CONFIG_RD_LZMA is not set
44-# CONFIG_RD_XZ is not set
45+CONFIG_RD_BZIP2=y
46+CONFIG_RD_LZMA=y
47+CONFIG_RD_XZ=y
48 # CONFIG_RD_LZO is not set
49 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50 CONFIG_SYSCTL=y
51@@ -196,7 +198,7 @@ CONFIG_BASE_SMALL=0
52 # CONFIG_MODULES is not set
53 CONFIG_STOP_MACHINE=y
54 CONFIG_BLOCK=y
55-# CONFIG_BLK_DEV_BSG is not set
56+CONFIG_BLK_DEV_BSG=y
57 # CONFIG_BLK_DEV_BSGLIB is not set
58 # CONFIG_BLK_DEV_INTEGRITY is not set
59
60@@ -755,7 +757,7 @@ CONFIG_CLS_U32_MARK=y
61 # CONFIG_NET_CLS_RSVP is not set
62 # CONFIG_NET_CLS_RSVP6 is not set
63 CONFIG_NET_CLS_FLOW=y
64-# CONFIG_NET_CLS_CGROUP is not set
65+CONFIG_NET_CLS_CGROUP=y
66 # CONFIG_NET_EMATCH is not set
67 CONFIG_NET_CLS_ACT=y
68 CONFIG_NET_ACT_POLICE=y
69@@ -837,7 +839,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
70 CONFIG_FW_LOADER=y
71 CONFIG_FIRMWARE_IN_KERNEL=y
72 CONFIG_EXTRA_FIRMWARE=""
73-CONFIG_FW_LOADER_USER_HELPER=y
74+# CONFIG_FW_LOADER_USER_HELPER is not set
75 # CONFIG_DEBUG_DRIVER is not set
76 # CONFIG_DEBUG_DEVRES is not set
77 # CONFIG_SYS_HYPERVISOR is not set
78@@ -949,7 +951,10 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
79 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
80 # CONFIG_BLK_DEV_DRBD is not set
81 # CONFIG_BLK_DEV_NBD is not set
82-# CONFIG_BLK_DEV_RAM is not set
83+CONFIG_BLK_DEV_RAM=y
84+CONFIG_BLK_DEV_RAM_COUNT=16
85+CONFIG_BLK_DEV_RAM_SIZE=65536
86+# CONFIG_BLK_DEV_XIP is not set
87 # CONFIG_CDROM_PKTCDVD is not set
88 # CONFIG_ATA_OVER_ETH is not set
89 # CONFIG_BLK_DEV_RBD is not set
90@@ -1565,9 +1570,13 @@ CONFIG_MD=y
91 CONFIG_BLK_DEV_DM_BUILTIN=y
92 CONFIG_BLK_DEV_DM=y
93 CONFIG_DM_DEBUG=y
94+CONFIG_DM_BUFIO=y
95+CONFIG_DM_BIO_PRISON=y
96+CONFIG_DM_PERSISTENT_DATA=y
97 CONFIG_DM_CRYPT=y
98 # CONFIG_DM_SNAPSHOT is not set
99-# CONFIG_DM_THIN_PROVISIONING is not set
100+CONFIG_DM_THIN_PROVISIONING=y
101+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
102 # CONFIG_DM_CACHE is not set
103 # CONFIG_DM_MIRROR is not set
104 # CONFIG_DM_RAID is not set
105@@ -1586,13 +1595,14 @@ CONFIG_NET_CORE=y
106 # CONFIG_MII is not set
107 CONFIG_IFB=y
108 # CONFIG_NET_TEAM is not set
109-# CONFIG_MACVLAN is not set
110-# CONFIG_VXLAN is not set
111+CONFIG_MACVLAN=y
112+# CONFIG_MACVTAP is not set
113+CONFIG_VXLAN=y
114 # CONFIG_NETCONSOLE is not set
115 # CONFIG_NETPOLL is not set
116 # CONFIG_NET_POLL_CONTROLLER is not set
117 CONFIG_TUN=y
118-# CONFIG_VETH is not set
119+CONFIG_VETH=y
120
121 #
122 # CAIF transport drivers
123@@ -2859,9 +2869,10 @@ CONFIG_QUOTA_TREE=y
124 # CONFIG_QFMT_V1 is not set
125 CONFIG_QFMT_V2=y
126 CONFIG_QUOTACTL=y
127-# CONFIG_AUTOFS4_FS is not set
128+CONFIG_AUTOFS4_FS=y
129 CONFIG_FUSE_FS=y
130 # CONFIG_CUSE is not set
131+CONFIG_GENERIC_ACL=y
132
133 #
134 # Caches
135@@ -2895,8 +2906,8 @@ CONFIG_PROC_SYSCTL=y
136 CONFIG_PROC_PAGE_MONITOR=y
137 CONFIG_SYSFS=y
138 CONFIG_TMPFS=y
139-# CONFIG_TMPFS_POSIX_ACL is not set
140-# CONFIG_TMPFS_XATTR is not set
141+CONFIG_TMPFS_POSIX_ACL=y
142+CONFIG_TMPFS_XATTR=y
143 # CONFIG_HUGETLB_PAGE is not set
144 CONFIG_CONFIGFS_FS=y
145 CONFIG_MISC_FILESYSTEMS=y
146@@ -3122,7 +3133,7 @@ CONFIG_SECURITYFS=y
147 CONFIG_SECURITY_NETWORK=y
148 # CONFIG_SECURITY_NETWORK_XFRM is not set
149 CONFIG_SECURITY_PATH=y
150-CONFIG_LSM_MMAP_MIN_ADDR=32768
151+CONFIG_LSM_MMAP_MIN_ADDR=0
152 CONFIG_SECURITY_SELINUX=y
153 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
154 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
155diff --git a/arch/arm64/configs/bq_aquaris_m10_ubuntu_defconfig b/arch/arm64/configs/bq_aquaris_m10_ubuntu_defconfig
156index 667a4ca..d0db364 100755
157--- a/arch/arm64/configs/bq_aquaris_m10_ubuntu_defconfig
158+++ b/arch/arm64/configs/bq_aquaris_m10_ubuntu_defconfig
159@@ -40,7 +40,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
160 CONFIG_SWAP=y
161 CONFIG_SYSVIPC=y
162 CONFIG_SYSVIPC_SYSCTL=y
163-# CONFIG_POSIX_MQUEUE is not set
164+CONFIG_POSIX_MQUEUE=y
165+CONFIG_POSIX_MQUEUE_SYSCTL=y
166 CONFIG_FHANDLE=y
167 CONFIG_AUDIT=y
168 # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
169@@ -98,16 +99,17 @@ CONFIG_GENERIC_SCHED_CLOCK=y
170 CONFIG_CGROUPS=y
171 # CONFIG_CGROUP_DEBUG is not set
172 CONFIG_CGROUP_FREEZER=y
173-# CONFIG_CGROUP_DEVICE is not set
174-# CONFIG_CPUSETS is not set
175+CONFIG_CGROUP_DEVICE=y
176+CONFIG_CPUSETS=y
177+CONFIG_PROC_PID_CPUSET=y
178 CONFIG_CGROUP_CPUACCT=y
179 # CONFIG_RESOURCE_COUNTERS is not set
180 CONFIG_CGROUP_SCHED=y
181 CONFIG_FAIR_GROUP_SCHED=y
182-# CONFIG_CFS_BANDWIDTH is not set
183+CONFIG_CFS_BANDWIDTH=y
184 CONFIG_RT_GROUP_SCHED=n
185 # CONFIG_BLK_CGROUP is not set
186-# CONFIG_CHECKPOINT_RESTORE is not set
187+CONFIG_CHECKPOINT_RESTORE=y
188 CONFIG_NAMESPACES=y
189 CONFIG_UTS_NS=y
190 CONFIG_IPC_NS=y
191@@ -122,9 +124,9 @@ CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
192 CONFIG_BLK_DEV_INITRD=y
193 CONFIG_INITRAMFS_SOURCE=""
194 CONFIG_RD_GZIP=y
195-# CONFIG_RD_BZIP2 is not set
196-# CONFIG_RD_LZMA is not set
197-# CONFIG_RD_XZ is not set
198+CONFIG_RD_BZIP2=y
199+CONFIG_RD_LZMA=y
200+CONFIG_RD_XZ=y
201 # CONFIG_RD_LZO is not set
202 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
203 CONFIG_SYSCTL=y
204@@ -192,7 +194,7 @@ CONFIG_BASE_SMALL=0
205 # CONFIG_MODULES is not set
206 CONFIG_STOP_MACHINE=y
207 CONFIG_BLOCK=y
208-# CONFIG_BLK_DEV_BSG is not set
209+CONFIG_BLK_DEV_BSG=y
210 # CONFIG_BLK_DEV_BSGLIB is not set
211 # CONFIG_BLK_DEV_INTEGRITY is not set
212
213@@ -751,7 +753,7 @@ CONFIG_CLS_U32_MARK=y
214 # CONFIG_NET_CLS_RSVP is not set
215 # CONFIG_NET_CLS_RSVP6 is not set
216 CONFIG_NET_CLS_FLOW=y
217-# CONFIG_NET_CLS_CGROUP is not set
218+CONFIG_NET_CLS_CGROUP=y
219 # CONFIG_NET_EMATCH is not set
220 CONFIG_NET_CLS_ACT=y
221 CONFIG_NET_ACT_POLICE=y
222@@ -833,7 +835,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
223 CONFIG_FW_LOADER=y
224 CONFIG_FIRMWARE_IN_KERNEL=y
225 CONFIG_EXTRA_FIRMWARE=""
226-CONFIG_FW_LOADER_USER_HELPER=y
227+# CONFIG_FW_LOADER_USER_HELPER is not set
228 # CONFIG_DEBUG_DRIVER is not set
229 # CONFIG_DEBUG_DEVRES is not set
230 # CONFIG_SYS_HYPERVISOR is not set
231@@ -945,7 +947,10 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
232 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
233 # CONFIG_BLK_DEV_DRBD is not set
234 # CONFIG_BLK_DEV_NBD is not set
235-# CONFIG_BLK_DEV_RAM is not set
236+CONFIG_BLK_DEV_RAM=y
237+CONFIG_BLK_DEV_RAM_COUNT=16
238+CONFIG_BLK_DEV_RAM_SIZE=65536
239+# CONFIG_BLK_DEV_XIP is not set
240 # CONFIG_CDROM_PKTCDVD is not set
241 # CONFIG_ATA_OVER_ETH is not set
242 # CONFIG_BLK_DEV_RBD is not set
243@@ -1559,9 +1564,13 @@ CONFIG_MD=y
244 CONFIG_BLK_DEV_DM_BUILTIN=y
245 CONFIG_BLK_DEV_DM=y
246 # CONFIG_DM_DEBUG is not set
247+CONFIG_DM_BUFIO=y
248+CONFIG_DM_BIO_PRISON=y
249+CONFIG_DM_PERSISTENT_DATA=y
250 CONFIG_DM_CRYPT=y
251 # CONFIG_DM_SNAPSHOT is not set
252-# CONFIG_DM_THIN_PROVISIONING is not set
253+CONFIG_DM_THIN_PROVISIONING=y
254+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
255 # CONFIG_DM_CACHE is not set
256 # CONFIG_DM_MIRROR is not set
257 # CONFIG_DM_RAID is not set
258@@ -1580,13 +1589,14 @@ CONFIG_NET_CORE=y
259 # CONFIG_MII is not set
260 CONFIG_IFB=y
261 # CONFIG_NET_TEAM is not set
262-# CONFIG_MACVLAN is not set
263-# CONFIG_VXLAN is not set
264+CONFIG_MACVLAN=y
265+# CONFIG_MACVTAP is not set
266+CONFIG_VXLAN=y
267 # CONFIG_NETCONSOLE is not set
268 # CONFIG_NETPOLL is not set
269 # CONFIG_NET_POLL_CONTROLLER is not set
270 CONFIG_TUN=y
271-# CONFIG_VETH is not set
272+CONFIG_VETH=y
273
274 #
275 # CAIF transport drivers
276@@ -2851,9 +2861,10 @@ CONFIG_QUOTA_TREE=y
277 # CONFIG_QFMT_V1 is not set
278 CONFIG_QFMT_V2=y
279 CONFIG_QUOTACTL=y
280-# CONFIG_AUTOFS4_FS is not set
281+CONFIG_AUTOFS4_FS=y
282 CONFIG_FUSE_FS=y
283 # CONFIG_CUSE is not set
284+CONFIG_GENERIC_ACL=y
285
286 #
287 # Caches
288@@ -2887,8 +2898,8 @@ CONFIG_PROC_SYSCTL=y
289 CONFIG_PROC_PAGE_MONITOR=y
290 CONFIG_SYSFS=y
291 CONFIG_TMPFS=y
292-# CONFIG_TMPFS_POSIX_ACL is not set
293-# CONFIG_TMPFS_XATTR is not set
294+CONFIG_TMPFS_POSIX_ACL=y
295+CONFIG_TMPFS_XATTR=y
296 # CONFIG_HUGETLB_PAGE is not set
297 CONFIG_CONFIGFS_FS=y
298 CONFIG_MISC_FILESYSTEMS=y
299@@ -3104,7 +3115,7 @@ CONFIG_SECURITYFS=y
300 CONFIG_SECURITY_NETWORK=y
301 # CONFIG_SECURITY_NETWORK_XFRM is not set
302 CONFIG_SECURITY_PATH=y
303-CONFIG_LSM_MMAP_MIN_ADDR=32768
304+CONFIG_LSM_MMAP_MIN_ADDR=0
305 CONFIG_SECURITY_SELINUX=y
306 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
307 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

Subscribers

People subscribed via source and target branches