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