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>

diff --cc drivers/android/binder.c
index bef788058bc3692f0cdde675d52759bcf0c197e9,265d9dd46a5ebb6610bf826ed0fa620b55c289a6..a606262da9d6de133f6a8b5292eb46439f126fd2
--- 1/drivers/android/binder.c
--- 2/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 {

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