Merge 4.14.239 into android-4.14-q

Changes in 4.14.239
	include/linux/mmdebug.h: make VM_WARN* non-rvals
	mm: add VM_WARN_ON_ONCE_PAGE() macro
	mm/rmap: remove unneeded semicolon in page_not_mapped()
	mm/rmap: use page_not_mapped in try_to_unmap()
	mm/thp: try_to_unmap() use TTU_SYNC for safe splitting
	mm/thp: fix vma_address() if virtual address below file offset
	mm/thp: fix page_address_in_vma() on file THP tails
	mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split
	mm: page_vma_mapped_walk(): use page for pvmw->page
	mm: page_vma_mapped_walk(): settle PageHuge on entry
	mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd
	mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block
	mm: page_vma_mapped_walk(): crossing page table boundary
	mm: page_vma_mapped_walk(): add a level of indentation
	mm: page_vma_mapped_walk(): use goto instead of while (1)
	mm: page_vma_mapped_walk(): get vma_address_end() earlier
	mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes
	mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk()
	mm, futex: fix shared futex pgoff on shmem huge page
	scsi: sr: Return appropriate error code when disk is ejected
	drm/nouveau: fix dma_address check for CPU/GPU sync
	kfifo: DECLARE_KIFO_PTR(fifo, u64) does not work on arm 32 bit
	kthread_worker: split code for canceling the delayed work timer
	kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
	xen/events: reset active flag for lateeoi events later
	Linux 4.14.239

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I317e740e580bb21a42a7b059f8da9ffc0d62cd6d

diff --cc Makefile
Simple merge

diff --cc include/linux/pagemap.h
Simple merge

diff --cc mm/huge_memory.c
Simple merge