Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 13 May 2016 04:20:56 +0000 (12:20 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 13 May 2016 04:20:56 +0000 (12:20 +0800)
commitf0161aad472599f8bb80ca8758fe30a60e627f56
treed3a92ef5d0f0a95c00a8d61efa1a3f13dce5069f
parent1deaaa33b1c6f5f6fe0b93bca6dca1ac74f288ba
parentb3f09bff3f6f291d4ef5d400426278856bf24c27
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

* linux-linaro-lsk-v4.4-android: (797 commits)
  parisc: Use generic extable search and sort routines
  arm64: kasan: Use actual memory node when populating the kernel image shadow
  arm64: mm: treat memstart_addr as a signed quantity
  arm64: lse: deal with clobbered IP registers after branch via PLT
  arm64: mm: check at build time that PAGE_OFFSET divides the VA space evenly
  arm64: kasan: Fix zero shadow mapping overriding kernel image shadow
  arm64: consistently use p?d_set_huge
  arm64: fix KASLR boot-time I-cache maintenance
  arm64: hugetlb: partial revert of 66b3923a1a0f
  arm64: make irq_stack_ptr more robust
  arm64: efi: invoke EFI_RNG_PROTOCOL to supply KASLR randomness
  efi: stub: use high allocation for converted command line
  efi: stub: add implementation of efi_random_alloc()
  efi: stub: implement efi_get_random_bytes() based on EFI_RNG_PROTOCOL
  arm64: kaslr: randomize the linear region
  arm64: add support for kernel ASLR
  arm64: add support for building vmlinux as a relocatable PIE binary
  arm64: switch to relative exception tables
  extable: add support for relative extables to search and sort routines
  scripts/sortextable: add support for ET_DYN binaries
  ...

Conflicts:
arch/arm64/mm/dma-mapping.c
drivers/clk/rockchip/clk-rk3368.c
drivers/mmc/core/core.c
drivers/mmc/core/sdio.c
include/linux/dcache.h

Change-Id: Ibaa1e90ac735db8d9f5e542c266ef27b91616ef4
21 files changed:
Makefile
arch/arm64/Makefile
arch/arm64/mm/dma-mapping.c
drivers/clk/rockchip/clk-rk3188.c
drivers/clk/rockchip/clk.c
drivers/cpufreq/cpufreq_interactive.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/qxl/qxl_display.c
drivers/gpu/drm/radeon/atombios_encoders.c
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
drivers/misc/Kconfig
drivers/mmc/card/block.c
drivers/mmc/host/sdhci.c
drivers/soc/rockchip/pm_domains.c
drivers/staging/android/ion/ion.c
drivers/thermal/thermal_core.c
include/linux/thermal.h