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