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
..
2017-10-05 09:41:48 +02:00
2017-06-21 15:13:01 +08:00
2014-12-14 16:10:09 -08:00
2015-06-03 12:41:53 +03:00
2015-06-03 12:41:51 +03:00
2015-06-03 12:41:49 +03:00
2015-08-25 09:59:44 +02:00
2015-06-03 12:41:49 +03:00
2015-09-24 14:35:36 +03:00
2014-07-01 13:32:30 +03:00
2015-10-28 10:30:17 +09:00
2015-06-03 12:41:50 +03:00
2015-11-10 10:00:09 -08:00
2015-12-09 12:57:13 +02:00
2015-06-03 12:41:52 +03:00
2015-06-03 12:41:50 +03:00
2015-06-03 12:41:50 +03:00
2015-11-06 17:50:42 -08:00
2015-03-02 13:17:25 +02:00
2014-06-24 10:55:13 +03:00
2014-06-27 10:15:22 +02:00
2015-02-26 10:23:15 +02:00
2015-06-23 16:23:30 -07:00
2015-08-25 09:59:45 +02:00
2015-06-07 15:28:57 +02:00
2015-09-02 14:24:51 +03:00
2014-10-20 16:21:51 +02:00
2014-07-30 14:10:39 +02:00
2017-12-20 10:04:57 +01:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2014-07-01 13:18:38 +03:00
2014-10-20 16:21:51 +02:00
2015-09-30 10:33:57 +03:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2014-08-26 12:48:34 +03:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2017-08-06 19:19:46 -07:00
2015-03-23 14:29:40 +11:00
2017-12-20 10:04:57 +01:00
2014-09-30 13:06:01 +03:00
2016-05-04 14:48:51 -07:00
2016-10-28 03:01:29 -04:00
2015-08-13 12:25:44 +02:00
2014-05-23 13:51:10 +03:00
2014-10-20 16:21:51 +02:00
2015-12-09 12:57:06 +02:00
2015-06-03 12:41:46 +03:00
2016-12-01 15:18:44 +05:30
2014-10-20 16:21:51 +02:00
2015-10-08 12:19:39 +03:00
2014-10-20 16:21:51 +02:00
2015-01-26 14:43:06 +02:00
2014-10-20 16:21:51 +02:00
2015-06-07 15:28:57 +02:00
2015-08-05 11:41:31 -07:00
2015-08-25 09:59:44 +02:00
2015-03-17 20:04:31 +11:00
2015-06-12 12:40:27 +03:00
2016-05-04 14:48:45 -07:00
2014-10-20 16:21:51 +02:00
2015-08-07 15:05:01 -07:00
2014-10-20 16:21:51 +02:00
2014-12-14 16:10:09 -08:00
2015-06-12 12:40:27 +03:00
2015-06-03 12:41:49 +03:00
2014-10-20 16:21:51 +02:00
2015-08-10 23:07:06 -04:00
2014-06-16 19:45:45 +10:00
2014-10-20 16:21:51 +02:00
2015-03-23 14:29:40 +11:00
2015-06-03 12:41:51 +03:00
2015-06-03 12:41:52 +03:00
2017-11-15 17:13:09 +01:00
2015-02-11 17:06:05 -08:00
2015-08-10 12:25:43 +03:00
2015-09-01 13:55:32 +03:00
2015-09-01 15:50:38 +02:00
2015-08-10 23:07:05 -04:00
2014-10-20 16:21:51 +02:00
2015-08-21 08:56:19 +03:00
2015-08-25 09:59:45 +02:00
2015-09-01 15:50:38 +02:00
2014-12-05 16:30:25 +00:00
2014-10-20 16:21:51 +02:00
2014-09-30 13:42:13 +03:00
2015-04-07 16:24:15 +03:00
2014-12-18 20:28:33 -08:00
2015-07-20 10:52:46 -07:00
2015-03-02 13:17:24 +02:00
2015-08-07 15:05:01 -07:00
2015-08-07 15:05:01 -07:00
2014-12-04 16:16:01 +02:00
2015-09-24 14:10:26 +03:00
2015-08-10 23:07:05 -04:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2015-06-03 12:41:52 +03:00
2015-11-10 10:00:09 -08:00
2017-12-20 10:04:57 +01:00
2015-05-28 11:32:10 +09:30
2014-09-30 13:06:01 +03:00
2015-06-16 09:42:11 +03:00
2015-08-20 12:03:53 +03:00
2015-01-13 13:35:04 +02:00
2015-08-25 09:59:45 +02:00
2014-10-20 16:21:51 +02:00
2014-10-20 16:21:51 +02:00
2017-04-21 09:30:06 +02:00
2014-10-20 16:21:51 +02:00