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