From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jan 2017 19:37:44 +0000 (-0800)
Subject: Merge tag 'char-misc-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: v4.10-rc3~2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/cc250e267bd56c531b0bee455fc724d50af83fac?hp=-c

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

Pull char/misc fixes from Greg KH:
 "Here are a few small char/misc driver fixes for 4.10-rc3.

  Two MEI driver fixes, and three NVMEM patches for reported issues, and
  a new Hyper-V driver MAINTAINER update. Nothing major at all, all have
  been in linux-next with no reported issues"

* tag 'char-misc-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  hyper-v: Add myself as additional MAINTAINER
  nvmem: fix nvmem_cell_read() return type doc
  nvmem: imx-ocotp: Fix wrong register size
  nvmem: qfprom: Allow single byte accesses for read/write
  mei: move write cb to completion on credentials failures
  mei: bus: fix mei_cldev_enable KDoc
---

cc250e267bd56c531b0bee455fc724d50af83fac
diff --combined MAINTAINERS
index c0441ab2f8b0,fd394aece553..5f0420a0da5b
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3800,7 -3800,6 +3800,7 @@@ F:	include/linux/devcoredump.
  DEVICE FREQUENCY (DEVFREQ)
  M:	MyungJoo Ham <myungjoo.ham@samsung.com>
  M:	Kyungmin Park <kyungmin.park@samsung.com>
 +R:	Chanwoo Choi <cw00.choi@samsung.com>
  L:	linux-pm@vger.kernel.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:	Maintained
@@@ -5081,11 -5080,9 +5081,11 @@@ F:	drivers/net/wan/dlci.
  F:	drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 +M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:	linux-fbdev@vger.kernel.org
 +T:	git git://github.com/bzolnier/linux.git
  Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
 -S:	Orphan
 +S:	Maintained
  F:	Documentation/fb/
  F:	drivers/video/
  F:	include/video/
@@@ -5507,7 -5504,6 +5507,7 @@@ M:	Alex Elder <elder@kernel.org
  M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:	Maintained
  F:	drivers/staging/greybus/
 +L:	greybus-dev@lists.linaro.org
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:	Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@@ -5965,6 -5961,7 +5965,7 @@@ F:	drivers/media/platform/sti/hv
  Hyper-V CORE AND DRIVERS
  M:	"K. Y. Srinivasan" <kys@microsoft.com>
  M:	Haiyang Zhang <haiyangz@microsoft.com>
+ M:	Stephen Hemminger <sthemmin@microsoft.com>
  L:	devel@linuxdriverproject.org
  S:	Maintained
  F:	arch/x86/include/asm/mshyperv.h
@@@ -8856,22 -8853,17 +8857,22 @@@ F:	drivers/video/fbdev/nvidia
  NVM EXPRESS DRIVER
  M:	Keith Busch <keith.busch@intel.com>
  M:	Jens Axboe <axboe@fb.com>
 +M:	Christoph Hellwig <hch@lst.de>
 +M:	Sagi Grimberg <sagi@grimberg.me>
  L:	linux-nvme@lists.infradead.org
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -W:	https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
 +T:	git://git.infradead.org/nvme.git
 +W:	http://git.infradead.org/nvme.git
  S:	Supported
  F:	drivers/nvme/host/
  F:	include/linux/nvme.h
 +F:	include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS TARGET DRIVER
  M:	Christoph Hellwig <hch@lst.de>
  M:	Sagi Grimberg <sagi@grimberg.me>
  L:	linux-nvme@lists.infradead.org
 +T:	git://git.infradead.org/nvme.git
 +W:	http://git.infradead.org/nvme.git
  S:	Supported
  F:	drivers/nvme/target/
  
@@@ -9851,7 -9843,7 +9852,7 @@@ M:	Mark Rutland <mark.rutland@arm.com
  M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:	linux-arm-kernel@lists.infradead.org
  S:	Maintained
 -F:	drivers/firmware/psci.c
 +F:	drivers/firmware/psci*.c
  F:	include/linux/psci.h
  F:	include/uapi/linux/psci.h
  
@@@ -13536,11 -13528,11 +13537,11 @@@ F:	arch/x86/xen/*swiotlb
  F:	drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:	Dave Chinner <david@fromorbit.com>
 +M:	Darrick J. Wong <darrick.wong@oracle.com>
  M:	linux-xfs@vger.kernel.org
  L:	linux-xfs@vger.kernel.org
  W:	http://xfs.org/
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
 +T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:	Supported
  F:	Documentation/filesystems/xfs.txt
  F:	fs/xfs/