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

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()
  ...

diff --cc MAINTAINERS
index 30bc6e417a035925e05546237f8219388b9fd4f7,bff407de157bdbe2898c887eac7553ca0e118685..89fd8040e29521f37487317c16650ed2c4cad172
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8140,26 -8154,8 +8145,26 @@@ F:    drivers/*/*/*pasemi
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:    Kees Cook <[email protected]>
  S:    Maintained
- F:    drivers/misc/lkdtm*
+ F:    drivers/misc/lkdtm/*
  
 +LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 +M:    Alan Stern <[email protected]>
 +M:    Andrea Parri <[email protected]>
 +M:    Will Deacon <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +M:    Boqun Feng <[email protected]>
 +M:    Nicholas Piggin <[email protected]>
 +M:    David Howells <[email protected]>
 +M:    Jade Alglave <[email protected]>
 +M:    Luc Maranget <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +R:    Akira Yokosawa <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/nvmem/Kconfig
Simple merge

diff --cc drivers/parport/parport_serial.c
Simple merge

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