Files
linux/fs
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-06-30 19:44:57 -07:00
2017-12-20 10:04:56 +01:00
2018-01-22 13:16:20 +05:30
2015-06-25 17:00:42 -07:00
2018-01-22 13:16:20 +05:30
2018-01-22 13:16:20 +05:30
2017-11-30 08:37:20 +00:00
2017-06-14 13:16:24 +02:00
2016-11-10 16:36:34 +01:00
2017-11-15 14:48:58 +08:00
2017-06-14 13:16:24 +02:00
2015-11-23 21:11:08 -05:00
2016-10-07 15:23:47 +02:00
2014-11-19 13:01:20 -05:00
2017-06-14 13:16:24 +02:00
2015-11-16 23:54:45 -08:00
2017-07-15 11:57:44 +02:00
2015-08-12 15:28:45 -05:00
2014-08-26 09:35:56 +02:00
2017-06-14 13:16:24 +02:00