Merge 5.2-rc4 into char-misc-next

We want the char/misc driver fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/bsr.c
Simple merge

diff --cc drivers/firmware/google/coreboot_table.h
Simple merge

diff --cc drivers/firmware/google/framebuffer-coreboot.c
Simple merge

diff --cc drivers/firmware/google/memconsole-coreboot.c
Simple merge

diff --cc drivers/firmware/google/memconsole.c
index c8156db0e3a093c359787f95ddbcd5f68cd53bb5,fe5aa740c34d6fd00d75d06cb77805f3dc9b3ee9..44d314ad69e4ec0e44395723b311c97256ec98f2
--- 1/drivers/firmware/google/memconsole.c
--- 2/drivers/firmware/google/memconsole.c
+++ b/drivers/firmware/google/memconsole.c
@@@ -4,17 -5,9 +5,8 @@@
   * Architecture-independent parts of the memory based BIOS console.
   *
   * Copyright 2017 Google Inc.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License v2.0 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   */
  
 -#include <linux/init.h>
  #include <linux/sysfs.h>
  #include <linux/kobject.h>
  #include <linux/module.h>

diff --cc drivers/firmware/google/vpd.c
Simple merge

diff --cc drivers/firmware/google/vpd_decode.c
index f8c9143472dfd8e9fe1feed5b76467be3e88af1f,c62fa7063a7cfd0f366e2e17ecfc68a408c0edc9..92e3258552fcafefc93c30ccf155a7043d40b92e
--- 1/drivers/firmware/google/vpd_decode.c
--- 2/drivers/firmware/google/vpd_decode.c
+++ b/drivers/firmware/google/vpd_decode.c
@@@ -4,17 -5,10 +5,8 @@@
   * Google VPD decoding routines.
   *
   * Copyright 2017 Google Inc.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License v2.0 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   */
  
 -#include <linux/export.h>
 -
  #include "vpd_decode.h"
  
  static int vpd_decode_len(const s32 max_len, const u8 *in,

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/altera-stapl/Kconfig
Simple merge

diff --cc drivers/misc/c2port/Kconfig
Simple merge

diff --cc drivers/misc/cb710/Kconfig
Simple merge

diff --cc drivers/misc/cxl/Kconfig
Simple merge

diff --cc drivers/misc/echo/Kconfig
index 004233587137df7a3003545b35ebc79fd9ab5b6c,39656413e70dd4e1acd87c01108640b4797e0268..be70b263e2713f49de41e22ebce834e3cfed4cc9
--- 1/drivers/misc/echo/Kconfig
--- 2/drivers/misc/echo/Kconfig
+++ b/drivers/misc/echo/Kconfig
@@@ -1,5 -1,7 +1,6 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  config ECHO
        tristate "Line Echo Canceller support"
 -      default n
        ---help---
          This driver provides line echo cancelling support for mISDN and
          Zaptel drivers.

diff --cc drivers/misc/eeprom/ee1004.c
Simple merge

diff --cc drivers/misc/genwqe/Kconfig
Simple merge

diff --cc drivers/misc/lis3lv02d/Kconfig
Simple merge

diff --cc drivers/misc/ocxl/Kconfig
Simple merge

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

diff --cc mm/balloon_compaction.c
Simple merge