Merge 4.14-rc6 into char-misc-next

We want the driver fixes in here and this resolves a merge issue with
the binder driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/android/binder_alloc.c
index ed0c9dc792eb4ef66f6d2b8e07a279b3c6e25df8,c2819a3d58a66e63e49cd7e91d3b7caa7a6551a1..6f6f745605afc44861c22c29b55f8a74f42f3dd6
--- 1/drivers/android/binder_alloc.c
--- 2/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@@ -215,8 -215,8 +215,8 @@@ static int binder_update_page_range(str
                }
        }
  
-       if (need_mm)
-               mm = get_task_mm(alloc->tsk);
 -      if (!vma && need_mm && mmget_not_zero(alloc->vma_vm_mm))
++      if (need_mm && mmget_not_zero(alloc->vma_vm_mm))
+               mm = alloc->vma_vm_mm;
  
        if (mm) {
                down_write(&mm->mmap_sem);
@@@ -565,9 -560,10 +560,9 @@@ static void binder_delete_free_buffer(s
                binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
                                   "%d: merge free, buffer %pK do not share page with %pK or %pK\n",
                                   alloc->pid, buffer->data,
-                                  prev->data, next->data);
+                                  prev->data, next ? next->data : NULL);
                binder_update_page_range(alloc, 0, buffer_start_page(buffer),
 -                                       buffer_start_page(buffer) + PAGE_SIZE,
 -                                       NULL);
 +                                       buffer_start_page(buffer) + PAGE_SIZE);
        }
        list_del(&buffer->entry);
        kfree(buffer);

diff --cc drivers/hv/channel_mgmt.c
Simple merge