From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Jun 2019 07:11:21 +0000 (+0200)
Subject: Merge 5.2-rc4 into char-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0154ec71d597692a0d0682b19eac4b3adfb7f3dc;p=linux.git

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>
---

0154ec71d597692a0d0682b19eac4b3adfb7f3dc
diff --cc drivers/firmware/google/memconsole.c
index c8156db0e3a09,fe5aa740c34d6..44d314ad69e4e
--- a/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_decode.c
index f8c9143472dfd,c62fa7063a7cf..92e3258552fca
--- a/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/echo/Kconfig
index 004233587137d,39656413e70dd..be70b263e2713
--- a/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.