From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Apr 2018 03:07:20 +0000 (-0700)
Subject: Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: v4.17-rc1~122
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497;p=linux.git

Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc updates from Greg KH:
 "Here is the big set of char/misc driver patches for 4.17-rc1.

  There are a lot of little things in here, nothing huge, but all
  important to the different hardware types involved:

   -  thunderbolt driver updates

   -  parport updates (people still care...)

   -  nvmem driver updates

   -  mei updates (as always)

   -  hwtracing driver updates

   -  hyperv driver updates

   -  extcon driver updates

   -  ... and a handful of even smaller driver subsystem and individual
      driver updates

  All of these have been in linux-next with no reported issues"

* tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (149 commits)
  hwtracing: Add HW tracing support menu
  intel_th: Add ACPI glue layer
  intel_th: Allow forcing host mode through drvdata
  intel_th: Pick up irq number from resources
  intel_th: Don't touch switch routing in host mode
  intel_th: Use correct method of finding hub
  intel_th: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate
  stm class: Make dummy's master/channel ranges configurable
  stm class: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate
  MAINTAINERS: Bestow upon myself the care for drivers/hwtracing
  hv: add SPDX license id to Kconfig
  hv: add SPDX license to trace
  Drivers: hv: vmbus: do not mark HV_PCIE as perf_device
  Drivers: hv: vmbus: respect what we get from hv_get_synint_state()
  /dev/mem: Avoid overwriting "err" in read_mem()
  eeprom: at24: use SPDX identifier instead of GPL boiler-plate
  eeprom: at24: simplify the i2c functionality checking
  eeprom: at24: fix a line break
  eeprom: at24: tweak newlines
  eeprom: at24: refactor at24_probe()
  ...
---

06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497
diff --cc MAINTAINERS
index 30bc6e417a03,bff407de157b..89fd8040e295
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8140,26 -8154,8 +8145,26 @@@ F:	drivers/*/*/*pasemi
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:	Kees Cook <keescook@chromium.org>
  S:	Maintained
- F:	drivers/misc/lkdtm*
+ F:	drivers/misc/lkdtm/*
  
 +LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 +M:	Alan Stern <stern@rowland.harvard.edu>
 +M:	Andrea Parri <parri.andrea@gmail.com>
 +M:	Will Deacon <will.deacon@arm.com>
 +M:	Peter Zijlstra <peterz@infradead.org>
 +M:	Boqun Feng <boqun.feng@gmail.com>
 +M:	Nicholas Piggin <npiggin@gmail.com>
 +M:	David Howells <dhowells@redhat.com>
 +M:	Jade Alglave <j.alglave@ucl.ac.uk>
 +M:	Luc Maranget <luc.maranget@inria.fr>
 +M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +R:	Akira Yokosawa <akiyks@gmail.com>
 +L:	linux-kernel@vger.kernel.org
 +S:	Supported
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:	tools/memory-model/
 +F:	Documentation/memory-barriers.txt
 +
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:	Chris Wright <chrisw@sous-sol.org>
  L:	linux-security-module@vger.kernel.org