Tao Huang
640193f76b
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (733 commits)
LSK-ANDROID: memcg: Remove wrong ->attach callback
LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
ANDROID: sdcardfs: Move default_normal to superblock
blkdev: Refactoring block io latency histogram codes
FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
FROMLIST: arm64: Move post_ttbr_update_workaround to C code
FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path
fscrypt: updates on 4.15-rc4
ANDROID: uid_sys_stats: fix the comment
BACKPORT: tee: indicate privileged dev in gen_caps
BACKPORT: tee: optee: sync with new naming of interrupts
BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
BACKPORT: tee: optee: interruptible RPC sleep
BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
BACKPORT: tee.txt: standardize document format
BACKPORT: tee: add forward declaration for struct device
BACKPORT: tee: optee: fix uninitialized symbol 'parg'
BACKPORT: tee: add ARM_SMCCC dependency
BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
...
Conflicts:
arch/arm64/kernel/vdso.c
drivers/usb/host/xhci-plat.c
include/drm/drmP.h
include/linux/kasan.h
kernel/time/timekeeping.c
mm/kasan/kasan.c
security/selinux/nlmsgtab.c
Also add this commit:
0bcdc0987c ("time: Fix ktime_get_raw() incorrect base accumulation")
2018-01-26 19:26:47 +08:00
..
2012-01-04 19:54:08 +08:00
2017-09-11 18:46:58 +08:00
2015-04-17 09:04:02 -04:00
2017-12-25 14:22:15 +01:00
2017-07-19 14:33:51 +08:00
2015-11-11 15:54:30 +08:00
2015-09-05 13:19:05 +02:00
2014-10-20 16:21:31 +02:00
2015-04-03 08:18:25 +02:00
2015-11-08 14:12:25 +01:00
2015-09-05 13:19:08 +02:00
2015-09-05 19:37:31 +02:00
2015-09-05 19:37:22 +02:00
2015-09-05 19:37:18 +02:00
2015-06-25 01:12:50 +02:00
2015-11-11 15:57:28 +08:00
2013-04-05 09:36:53 -07:00
2015-09-05 13:19:13 +02:00
2014-10-20 16:21:31 +02:00
2015-09-05 13:19:09 +02:00
2015-09-05 13:19:06 +02:00
2014-10-20 16:21:31 +02:00
2015-11-11 15:57:28 +08:00
2015-09-05 19:37:22 +02:00
2015-09-05 13:19:07 +02:00
2015-04-17 09:04:00 -04:00
2014-10-20 16:21:31 +02:00
2015-12-20 13:39:29 +01:00
2015-11-08 14:12:29 +01:00
2015-09-05 13:19:07 +02:00
2015-04-17 09:04:01 -04:00
2014-10-20 16:21:31 +02:00
2015-06-25 01:13:40 +02:00
2015-06-25 01:13:40 +02:00
2014-10-20 16:21:31 +02:00
2015-10-28 10:30:17 +09:00
2015-11-26 18:11:26 +01:00
2015-11-10 10:01:21 -08:00
2015-10-28 10:30:17 +09:00
2015-09-05 19:37:22 +02:00
2015-11-10 10:01:21 -08:00
2015-09-05 13:19:10 +02:00
2015-09-05 13:19:10 +02:00
2015-06-25 01:13:36 +02:00
2016-05-04 14:48:51 -07:00
2015-09-05 13:19:10 +02:00
2014-10-20 16:21:31 +02:00
2015-09-05 19:36:21 +02:00
2015-10-28 10:30:17 +09:00
2015-04-17 09:04:02 -04:00
2015-06-25 01:13:44 +02:00
2015-04-17 09:03:59 -04:00
2015-06-25 01:13:38 +02:00
2015-09-05 13:19:06 +02:00
2015-09-05 13:19:09 +02:00
2014-10-20 16:21:31 +02:00
2015-06-19 20:03:20 +02:00
2017-11-09 11:07:04 +08:00
2015-03-12 15:48:12 +08:00
2010-06-21 13:34:52 +08:00
2015-06-19 20:03:21 +02:00
2015-11-08 14:12:30 +01:00
2015-09-05 13:19:08 +02:00
2015-11-08 14:12:30 +01:00
2014-10-20 16:21:31 +02:00
2014-11-21 12:00:00 -08:00
2014-10-20 16:21:31 +02:00
2015-09-05 13:19:06 +02:00
2014-10-20 16:21:31 +02:00
2015-06-21 21:53:59 +02:00
2011-06-28 15:24:06 +08:00
2015-04-17 09:04:02 -04:00
2015-10-28 10:30:17 +09:00
2015-10-28 10:30:17 +09:00
2014-10-20 16:21:31 +02:00
2015-09-05 13:19:10 +02:00
2014-10-20 16:21:31 +02:00
2015-06-25 01:13:36 +02:00
2015-10-28 10:30:17 +09:00
2015-11-11 15:57:28 +08:00
2014-10-20 16:21:31 +02:00
2015-09-05 19:37:21 +02:00
2015-06-25 01:13:36 +02:00
2016-05-04 14:48:52 -07:00
2015-06-25 01:13:37 +02:00
2015-06-25 01:13:35 +02:00
2015-10-28 10:30:17 +09:00
2015-09-05 19:37:22 +02:00
2015-09-05 19:37:22 +02:00
2015-04-15 16:35:24 -07:00
2015-04-17 09:04:02 -04:00
2015-09-05 19:37:22 +02:00
2015-09-05 19:37:22 +02:00
2015-08-05 20:03:56 +08:00
2014-10-20 16:21:31 +02:00
2016-11-26 09:54:53 +01:00
2015-11-08 14:12:30 +01:00
2016-02-16 13:54:18 -08:00
2014-10-20 16:21:31 +02:00
2015-10-28 10:30:17 +09:00
2015-11-08 14:12:28 +01:00
2015-09-05 13:19:06 +02:00
2017-12-20 10:04:57 +01:00
2015-09-05 13:19:06 +02:00
2013-04-29 18:28:38 -07:00
2015-11-08 14:12:26 +01:00
2013-11-13 12:09:31 +09:00
2017-12-25 14:22:14 +01:00
2014-11-03 19:53:56 -08:00
2013-04-09 14:13:32 -04:00
2014-10-20 16:21:31 +02:00
2014-10-20 16:21:31 +02:00
2015-09-05 19:37:16 +02:00
2015-10-28 10:30:17 +09:00
2014-10-20 16:21:31 +02:00
2016-02-29 20:49:13 +08:00
2017-08-23 20:35:50 +08:00
2014-07-25 16:23:54 +08:00
2015-09-05 13:19:10 +02:00
2014-10-20 16:21:31 +02:00
2015-10-28 10:30:17 +09:00
2014-10-14 02:18:19 +02:00
2014-09-11 14:28:23 +08:00
2015-11-11 15:57:28 +08:00
2015-11-08 14:12:32 +01:00
2015-10-28 10:30:17 +09:00
2016-05-04 14:48:52 -07:00
2015-09-05 13:19:06 +02:00
2016-08-20 18:09:27 +02:00
2013-04-19 13:51:25 +02:00
2015-09-05 19:37:21 +02:00
2017-04-08 09:53:32 +02:00
2010-10-13 12:22:33 +08:00
2010-09-03 22:16:14 +08:00
2015-09-05 19:37:16 +02:00
2015-09-05 19:37:16 +02:00
2014-10-20 16:21:31 +02:00
2015-09-05 13:19:06 +02:00
2015-07-15 10:15:10 +08:00
2015-06-25 01:13:40 +02:00
2015-07-23 17:07:35 +01:00
2014-10-20 16:21:31 +02:00
2015-09-05 13:19:10 +02:00
2015-11-08 14:12:27 +01:00
2014-10-20 16:21:31 +02:00
2017-03-12 06:37:30 +01:00
2015-06-25 01:13:42 +02:00
2015-09-05 13:19:07 +02:00
2017-04-21 09:30:07 +02:00
2015-04-03 08:18:24 +02:00
2014-10-20 16:21:31 +02:00
2014-10-20 16:21:31 +02:00
2014-10-20 16:21:31 +02:00
2014-10-20 16:21:31 +02:00
2015-04-17 09:04:02 -04:00
2015-09-05 13:19:10 +02:00
2015-06-25 01:13:38 +02:00
2016-05-04 14:48:51 -07:00
2015-09-05 19:37:22 +02:00
2013-11-08 21:34:05 +08:00
2013-04-29 18:28:32 -07:00
2015-04-17 09:03:59 -04:00
2014-10-20 16:21:31 +02:00
2015-09-05 19:37:19 +02:00
2015-06-25 01:13:42 +02:00