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