From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jul 2019 23:04:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec9249752465b87b5b26d03f476eebaf872ebd12;p=uclinux-h8%2Flinux.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc updates from David Miller:
 "Just a few small changes:

   - Fix console naming inconsistency with hypervisor consoles, from
     John Paul Adrian Glaubitz

   - Fix userland compilation due to use of u_int, from Masahiro Yamada"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Add missing newline at end of file
  sparc: fix unknown type name u_int in uapi header
  sparc: configs: Remove useless UEVENT_HELPER_PATH
  sparc: Remove redundant copy of the LGPL-2.0
  sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg
---

ec9249752465b87b5b26d03f476eebaf872ebd12