From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 27 Oct 2019 17:48:33 +0000 (+0100)
Subject: Merge 5.4-rc5 into char-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da80d2e516eb858eb5bcca7fa5f5a13ed86930e4;p=linux.git

Merge 5.4-rc5 into char-misc-next

We want the binder fix in here as well for testing and to work on top
of.

Also handles a merge issue in binder.c to help linux-next out

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

da80d2e516eb858eb5bcca7fa5f5a13ed86930e4
diff --cc drivers/android/binder.c
index bef788058bc36,265d9dd46a5eb..a606262da9d6d
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@@ -93,10 -92,11 +93,6 @@@ static atomic_t binder_last_id
  static int proc_show(struct seq_file *m, void *unused);
  DEFINE_SHOW_ATTRIBUTE(proc);
  
- #ifndef SZ_4M
- #define SZ_4M                               0x400000
 -/* This is only defined in include/asm-arm/sizes.h */
 -#ifndef SZ_1K
 -#define SZ_1K                               0x400
--#endif
--
  #define FORBIDDEN_MMAP_FLAGS                (VM_WRITE)
  
  enum {