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-03 12:39:31 -08:00
2017-05-14 13:32:56 +02:00
2014-01-08 15:01:39 -08:00
2015-11-11 15:57:28 +08:00
2017-01-19 20:17:21 +01:00
2017-10-18 09:20:43 +02:00
2018-01-17 09:35:31 +01:00
2017-01-12 11:22:46 +01:00
2016-04-12 09:08:42 -07:00
2015-11-11 15:57:28 +08:00
2017-05-14 13:32:56 +02:00
2014-01-08 15:01:39 -08:00
2015-03-27 17:36:29 +01:00
2018-01-02 20:33:27 +01:00
2018-01-02 20:33:27 +01:00
2013-11-08 21:34:05 +08:00
2017-11-21 09:21:23 +01:00
2015-11-11 15:57:28 +08:00
2017-05-14 13:32:57 +02:00
2017-05-25 14:30:13 +02:00
2015-11-11 15:57:28 +08:00
2015-12-18 09:30:34 -08:00
2014-01-08 15:01:39 -08:00
2014-01-03 12:31:46 -08:00
2017-01-12 11:22:46 +01:00
2015-06-23 14:08:54 -07:00
2017-05-14 13:32:56 +02:00
2014-01-03 12:39:31 -08:00
2016-06-01 12:15:51 -07:00
2017-01-19 20:17:20 +01:00
2017-01-12 11:22:46 +01:00
2014-09-15 18:43:08 +02:00
2017-05-25 14:30:13 +02:00
2017-10-27 10:23:15 +02:00
2017-10-08 10:14:17 +02:00
2017-10-08 10:14:18 +02:00
2016-06-01 12:15:51 -07:00
2014-01-08 15:01:39 -08:00
2017-03-18 19:09:58 +08:00
2017-02-26 11:07:51 +01:00
2018-01-02 20:33:27 +01:00
2017-01-12 11:22:46 +01:00
2017-08-16 13:40:29 -07:00
2017-08-16 13:40:29 -07:00
2014-01-08 15:01:39 -08:00
2018-01-02 20:33:27 +01:00
2017-05-14 13:32:57 +02:00
2017-03-18 19:09:57 +08:00
2015-11-11 15:57:28 +08:00
2017-02-26 11:07:51 +01:00
2017-05-14 13:32:56 +02:00
2015-11-11 15:57:28 +08:00
2017-05-14 13:32:56 +02:00
2015-11-16 14:07:01 +01:00
2014-01-08 15:01:39 -08:00
2015-11-11 15:57:28 +08:00
2016-09-24 10:07:39 +02:00
2016-11-10 16:36:33 +01:00
2015-10-09 12:42:40 +02:00
2016-02-17 12:31:01 -08:00
2014-01-03 12:39:31 -08:00
2015-11-11 15:57:28 +08:00
2014-01-08 15:01:39 -08:00
2014-09-04 11:18:26 +02:00