android_kernel_oneplus_msm8998/mm
Srinivasarao P 80eb7ccae4 Merge android-4.4.104 (8bc4213) into msm-4.4
* refs/heads/tmp-8bc4213
  Linux 4.4.104
  nfsd: Fix another OPEN stateid race
  nfsd: Fix stateid races between OPEN and CLOSE
  nfsd: Make init_open_stateid() a bit more whole
  drm/i915: Prevent zero length "index" write
  drm/i915: Don't try indexed reads to alternate slave addresses
  NFS: revalidate "." etc correctly on "open".
  mtd: nand: Fix writing mtdoops to nand flash.
  drm/panel: simple: Add missing panel_simple_unprepare() calls
  drm/radeon: fix atombios on big endian
  Revert "drm/radeon: dont switch vt on suspend"
  bcache: Fix building error on MIPS
  eeprom: at24: check at24_read/write arguments
  mmc: core: Do not leave the block driver in a suspended state
  KVM: x86: inject exceptions produced by x86_decode_insn
  KVM: x86: Exit to user-mode on #UD intercept when emulator requires
  KVM: x86: pvclock: Handle first-time write to pvclock-page contains random junk
  btrfs: clear space cache inode generation always
  mm/madvise.c: fix madvise() infinite loop under special circumstances
  mm, thp: Do not make page table dirty unconditionally in touch_p[mu]d()
  x86/efi-bgrt: Replace early_memremap() with memremap()
  x86/efi-bgrt: Fix kernel panic when mapping BGRT data
  ARM: dts: omap3: logicpd-torpedo-37xx-devkit: Fix MMC1 cd-gpio
  x86/efi: Build our own page table structures
  x86/efi: Hoist page table switching code into efi_call_virt()
  x86/mm/pat: Ensure cpa->pfn only contains page frame numbers
  ipsec: Fix aborted xfrm policy dump crash
  netlink: add a start callback for starting a netlink dump
  Documentation: tee subsystem and op-tee driver
  tee: add OP-TEE driver
  tee: generic TEE subsystem
  dt/bindings: add bindings for optee
  kernel.h: add u64_to_user_ptr()
  ARM: 8481/2: drivers: psci: replace psci firmware calls
  ARM: 8480/2: arm64: add implementation for arm-smccc
  ARM: 8479/2: add implementation for arm-smccc
  ARM: 8478/2: arm/arm64: add arm-smccc
  UPSTREAM: net: xfrm: allow clearing socket xfrm policies.

Conflicts:
	arch/arm64/kernel/arm64ksyms.c
	arch/arm64/kernel/asm-offsets.c
	arch/arm64/kvm/hyp/fpsimd.S
	drivers/Kconfig
	drivers/Makefile
	drivers/firmware/psci.c
	drivers/gpu/drm/msm/msm_gem_submit.c
	drivers/mmc/core/bus.c
	include/linux/arm-smccc.h

Change-Id: Ib22051f60c49ecf3bb7e18f9940ba9a4ac5143af
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-01-02 18:31:53 +05:30
..
kasan Merge branch 'android-4.4@77ddb50' (v4.4.74) into 'msm-4.4' 2017-06-28 10:03:23 -07:00
backing-dev.c block: Dynamically allocate and refcount backing_dev_info 2017-10-18 12:05:44 +05:30
balloon_compaction.c mm: balloon: use general non-lru movable page feature 2017-02-21 12:38:41 +05:30
bootmem.c mm: Remove __init annotations from free_bootmem_late 2016-03-22 11:03:23 -07:00
cleancache.c
cma.c Merge tag 'lsk-v4.4-16.12-android' into branch 'msm-4.4' 2017-02-28 17:10:49 -08:00
cma.h
cma_debug.c
compaction.c mm/page_alloc: introduce post allocation processing on page allocator 2017-07-07 15:39:34 +05:30
debug.c mm, page_owner: dump page owner info from dump_page() 2017-07-07 15:12:10 +05:30
dmapool.c mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd 2015-11-06 17:50:42 -08:00
early_ioremap.c mm/early_ioremap: use offset_in_page macro 2015-11-05 19:34:48 -08:00
fadvise.c
failslab.c mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM 2015-11-06 17:50:42 -08:00
filemap.c Merge tag v4.4.55 into branch 'msm-4.4' 2017-03-23 03:22:14 -07:00
frame_vector.c
frontswap.c
gup.c mm: larger stack guard gap, between vmas 2017-06-26 07:13:11 +02:00
highmem.c
huge_memory.c mm, thp: Do not make page table dirty unconditionally in touch_p[mu]d() 2017-12-05 11:22:50 +01:00
hugetlb.c mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() 2017-04-08 09:53:32 +02:00
hugetlb_cgroup.c mm: make compound_head() robust 2015-11-06 17:50:42 -08:00
hwpoison-inject.c
init-mm.c mm: Add a user_ns owner to mm_struct and fix ptrace permission checks 2017-01-06 11:16:11 +01:00
internal.h Merge android-4.4@4b8fc9f (v4.4.82) into msm-4.4 2017-09-01 11:47:49 -07:00
interval_tree.c
Kconfig mm/Kconfig: Enable MEMORY_HOTPLUG for arm64 2017-11-22 08:14:30 +05:30
Kconfig.debug mm: allow page poisoning to be enabled by default. 2017-04-14 23:43:05 +05:30
kmemcheck.c
kmemleak-test.c
kmemleak.c kmemleak : Make kmemleak_stack_scan optional using config 2016-03-22 11:03:47 -07:00
ksm.c Merge tag 'lsk-v4.4-16.12-android' into branch 'msm-4.4' 2017-02-28 17:10:49 -08:00
list_lru.c mm/list_lru.c: fix list_lru_count_node() to be race free 2017-07-21 07:44:56 +02:00
maccess.c x86: remove more uaccess_32.h complexity 2016-08-27 11:23:38 +08:00
madvise.c This is the 4.4.104 stable release 2017-12-05 11:31:58 +01:00
Makefile mm/page_poison.c: enable PAGE_POISONING as a separate option 2017-04-14 23:43:04 +05:30
memblock.c arm64: Memory hotplug support for arm64 platform 2017-11-22 08:11:50 +05:30
memcontrol.c Merge tag 'lsk-v4.4-17.02-android' into branch 'msm-4.4' 2017-03-18 08:55:10 -07:00
memory-failure.c Merge branch 'android-4.4@77ddb50' (v4.4.74) into 'msm-4.4' 2017-06-28 10:03:23 -07:00
memory.c Merge android-4.4@4b8fc9f (v4.4.82) into msm-4.4 2017-09-01 11:47:49 -07:00
memory_hotplug.c arm64: Honor limits set by bootloader 2017-11-22 17:12:55 +05:30
mempolicy.c This is the 4.4.84 stable release 2017-08-29 14:33:50 +02:00
mempool.c mm/mempool: avoid KASAN marking mempool poison checks as use-after-free 2017-08-12 19:29:09 -07:00
memtest.c lib: memtest: Add MEMTEST_ENABLE_DEFAULT option 2016-05-05 15:05:52 -07:00
migrate.c Merge android-4.4@610af85 (v4.4.85) into msm-4.4 2017-09-04 17:20:09 -07:00
mincore.c mm/mincore: use offset_in_page macro 2015-11-05 19:34:48 -08:00
mlock.c This is the 4.4.71 stable release 2017-06-07 12:36:01 +02:00
mm_init.c
mmap.c Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4 2017-08-04 07:53:32 -07:00
mmu_context.c
mmu_notifier.c
mmzone.c
mprotect.c This is the 4.4.81 stable release 2017-08-11 13:09:21 -07:00
mremap.c mm, mprotect: flush TLB if potentially racing with a parallel reclaim leaving stale TLB entries 2017-08-11 09:08:50 -07:00
msync.c
nobootmem.c mm: Remove __init annotations from free_bootmem_late 2016-03-22 11:03:23 -07:00
nommu.c mm/nommu.c: drop unlikely inside BUG_ON() 2015-11-05 19:34:48 -08:00
oom_kill.c mm, oom: make dump_tasks public 2016-03-22 11:03:30 -07:00
page-writeback.c block: Use pointer to backing_dev_info from request_queue 2017-10-18 12:05:43 +05:30
page_alloc.c Merge android-4.4.101 (f0b9d2d) into msm-4.4 2017-12-26 19:13:02 +05:30
page_counter.c mm: page_counter: let page_counter_try_charge() return bool 2015-11-05 19:34:48 -08:00
page_ext.c Merge android-4.4.101 (f0b9d2d) into msm-4.4 2017-12-26 19:13:02 +05:30
page_idle.c
page_io.c
page_isolation.c mm/page_alloc: introduce post allocation processing on page allocator 2017-07-07 15:39:34 +05:30
page_owner.c mm: check the return value of lookup_page_ext for all call sites 2017-11-24 08:32:25 +01:00
page_poison.c mm: allow page poisoning to be enabled by default. 2017-04-14 23:43:05 +05:30
pagewalk.c mm/pagewalk.c: report holes in hugetlb ranges 2017-11-24 08:32:25 +01:00
percpu-km.c
percpu-vm.c
percpu.c percpu: acquire pcpu_lock when updating pcpu_nr_empty_pop_pages 2017-03-26 12:13:20 +02:00
pgtable-generic.c mm,thp: khugepaged: call pte flush at the time of collapse 2016-02-25 12:01:23 -08:00
process_reclaim.c lowmemorykiller: Introduce sysfs node for ALMK and PPR adj threshold 2016-12-17 16:16:17 +05:30
process_vm_access.c BACKPORT: ptrace: use fsuid, fsgid, effective creds for fs access checks 2016-07-07 16:30:43 -07:00
quicklist.c
readahead.c mm: change initial readahead window size calculation 2016-03-22 11:03:39 -07:00
rmap.c Merge android-4.4@4b8fc9f (v4.4.82) into msm-4.4 2017-09-01 11:47:49 -07:00
shmem.c This is the 4.4.16 stable release 2016-08-01 15:57:55 -07:00
showmem.c mm: showmem: make the notifiers atomic 2016-03-22 11:03:55 -07:00
slab.c UPSTREAM: mm: SLAB hardened usercopy support 2016-09-06 15:54:24 +00:00
slab.h slab/slub: adjust kmem_cache_alloc_bulk API 2015-11-22 11:58:44 -08:00
slab_common.c slub: do not merge cache if slub_debug contains a never-merge flag 2017-10-21 17:09:05 +02:00
slob.c slab/slub: adjust kmem_cache_alloc_bulk API 2015-11-22 11:58:44 -08:00
slub.c Merge branch 'android-4.4@6fc0573' into branch 'msm-4.4' 2017-06-19 16:59:55 -07:00
sparse-vmemmap.c
sparse.c
swap.c mm: make compound_head() robust 2015-11-06 17:50:42 -08:00
swap_cgroup.c mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff() 2017-07-05 14:37:15 +02:00
swap_ratio.c mm: swap_ratio: bail out if there aren't any other swap device 2016-05-31 15:23:38 -07:00
swap_state.c lowmemorykiller: Don't count swap cache pages twice 2016-04-13 11:11:01 -07:00
swapfile.c Merge tag 'lsk-v4.4-16.12-android' into branch 'msm-4.4' 2017-02-28 17:10:49 -08:00
truncate.c Merge branch 'android-4.4@e76c0fa' into branch 'msm-4.4' 2017-06-20 14:55:15 -07:00
usercopy.c mm: Fix build for hardened usercopy 2016-10-12 22:35:30 +05:30
userfaultfd.c
util.c f2fs: catch up to v4.14-rc1 2017-10-03 17:19:14 -07:00
vmacache.c mm/vmacache: inline vmacache_valid_mm() 2015-11-05 19:34:48 -08:00
vmalloc.c mm: add preempt points into __purge_vmap_area_lazy() 2017-06-19 15:28:58 +05:30
vmpressure.c mm: vmpressure: fix sending wrong events on underflow 2017-03-12 06:37:25 +01:00
vmscan.c Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4 2017-08-04 07:53:32 -07:00
vmstat.c This is the 4.4.101 stable release 2017-11-24 08:56:48 +01:00
workingset.c mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page() 2016-10-28 03:01:34 -04:00
zbud.c mm: zbud: fix the locking scenarios with zcache 2016-08-25 11:49:45 +05:30
zcache.c mm: zcache: fix merge issues 2016-06-07 11:57:44 -07:00
zpool.c mm: zsmalloc: constify struct zs_pool name 2015-11-06 17:50:42 -08:00
zsmalloc.c mm: fix build warnings in <linux/compaction.h> 2017-02-21 12:41:38 +05:30
zswap.c zswap: disable changing params if init fails 2017-02-09 08:02:45 +01:00