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