From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Feb 2018 18:31:17 +0000 (-0800)
Subject: Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: for-linus-20180210~18
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f6cff79f1d122f78a4b35bf4b2f0112afcd89ea4;p=linux-2.6-block.git

Merge tag 'char-misc-4.16-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the big pull request for char/misc drivers for 4.16-rc1.

  There's a lot of stuff in here. Three new driver subsystems were added
  for various types of hardware busses:

   - siox
   - slimbus
   - soundwire

  as well as a new vboxguest subsystem for the VirtualBox hypervisor
  drivers.

  There's also big updates from the FPGA subsystem, lots of Android
  binder fixes, the usual handful of hyper-v updates, and lots of other
  smaller driver updates.

  All of these have been in linux-next for a long time, with no reported
  issues"

* tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (155 commits)
  char: lp: use true or false for boolean values
  android: binder: use VM_ALLOC to get vm area
  android: binder: Use true and false for boolean values
  lkdtm: fix handle_irq_event symbol for INT_HW_IRQ_EN
  EISA: Delete error message for a failed memory allocation in eisa_probe()
  EISA: Whitespace cleanup
  misc: remove AVR32 dependencies
  virt: vbox: Add error mapping for VERR_INVALID_NAME and VERR_NO_MORE_FILES
  soundwire: Fix a signedness bug
  uio_hv_generic: fix new type mismatch warnings
  uio_hv_generic: fix type mismatch warnings
  auxdisplay: img-ascii-lcd: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  uio_hv_generic: add rescind support
  uio_hv_generic: check that host supports monitor page
  uio_hv_generic: create send and receive buffers
  uio: document uio_hv_generic regions
  doc: fix documentation about uio_hv_generic
  vmbus: add monitor_id and subchannel_id to sysfs per channel
  vmbus: fix ABI documentation
  uio_hv_generic: use ISR callback method
  ...
---

f6cff79f1d122f78a4b35bf4b2f0112afcd89ea4
diff --cc drivers/Kconfig
index ef5fb8395d76,02b6fd0864c8..879dc0604cba
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -211,6 -213,8 +213,10 @@@ source "drivers/mux/Kconfig
  
  source "drivers/opp/Kconfig"
  
 +source "drivers/visorbus/Kconfig"
 +
+ source "drivers/siox/Kconfig"
+ 
+ source "drivers/slimbus/Kconfig"
+ 
  endmenu
diff --cc drivers/Makefile
index 7a2330077e47,e09663776d8b..7a0438744053
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -184,4 -186,4 +186,5 @@@ obj-$(CONFIG_FPGA)		+= fpga
  obj-$(CONFIG_FSI)		+= fsi/
  obj-$(CONFIG_TEE)		+= tee/
  obj-$(CONFIG_MULTIPLEXER)	+= mux/
 +obj-$(CONFIG_UNISYS_VISORBUS)	+= visorbus/
+ obj-$(CONFIG_SIOX)		+= siox/