From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jul 2024 22:55:08 +0000 (-0700)
Subject: Merge tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: io_uring-6.11-20240722~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=acc5965b9ff8a1889f5b51466562896d59c6e1b9;p=linux-block.git

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

Pull char / misc and other driver updates from Greg KH:
 "Here is the "big" set of char/misc and other driver subsystem changes
  for 6.11-rc1. Nothing major in here, just loads of new drivers and
  updates. Included in here are:

   - IIO api updates and new drivers added

   - wait_interruptable_timeout() api cleanups for some drivers

   - MODULE_DESCRIPTION() additions for loads of drivers

   - parport out-of-bounds fix

   - interconnect driver updates and additions

   - mhi driver updates and additions

   - w1 driver fixes

   - binder speedups and fixes

   - eeprom driver updates

   - coresight driver updates

   - counter driver update

   - new misc driver additions

   - other minor api updates

  All of these, EXCEPT for the final Kconfig build fix for 32bit
  systems, have been in linux-next for a while with no reported issues.
  The Kconfig fixup went in 29 hours ago, so might have missed the
  latest linux-next, but was acked by everyone involved"

* tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (330 commits)
  misc: Kconfig: exclude mrvl-cn10k-dpi compilation for 32-bit systems
  misc: delete Makefile.rej
  binder: fix hang of unregistered readers
  misc: Kconfig: add a new dependency for MARVELL_CN10K_DPI
  virtio: add missing MODULE_DESCRIPTION() macro
  agp: uninorth: add missing MODULE_DESCRIPTION() macro
  spmi: add missing MODULE_DESCRIPTION() macros
  dev/parport: fix the array out-of-bounds risk
  samples: configfs: add missing MODULE_DESCRIPTION() macro
  misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver
  misc: keba: Fix missing AUXILIARY_BUS dependency
  slimbus: Fix struct and documentation alignment in stream.c
  MAINTAINERS: CC dri-devel list on Qualcomm FastRPC patches
  misc: fastrpc: use coherent pool for untranslated Compute Banks
  misc: fastrpc: support complete DMA pool access to the DSP
  misc: fastrpc: add missing MODULE_DESCRIPTION() macro
  misc: fastrpc: Add missing dev_err newlines
  misc: fastrpc: Use memdup_user()
  nvmem: core: Implement force_ro sysfs attribute
  nvmem: Use sysfs_emit() for type attribute
  ...
---

acc5965b9ff8a1889f5b51466562896d59c6e1b9
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index db06afedd818,044e2001f4e3..928e687385ab
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1268,8 -1254,8 +1268,10 @@@ patternProperties
      description: Smart Battery System
    "^schindler,.*":
      description: Schindler
 +  "^schneider,.*":
 +    description: Schneider Electric
+   "^sciosense,.*":
+     description: ScioSense B.V.
    "^seagate,.*":
      description: Seagate Technology PLC
    "^seeed,.*":
diff --cc MAINTAINERS
index 4a096207f8b4,4174d2869e7e..cfcd56315d0c
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13621,11 -13477,11 +13639,16 @@@ S:	Supporte
  F:	Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
  F:	drivers/mmc/host/sdhci-xenon*
  
+ MARVELL OCTEON CN10K DPI DRIVER
+ M:	Vamsi Attunuru <vattunuru@marvell.com>
+ S:	Supported
+ F:	drivers/misc/mrvl_cn10k_dpi.c
+ 
 +MARVELL OCTEON ENDPOINT VIRTIO DATA PATH ACCELERATOR
 +R:	schalla@marvell.com
 +R:	vattunuru@marvell.com
 +F:	drivers/vdpa/octeon_ep/
 +
  MATROX FRAMEBUFFER DRIVER
  L:	linux-fbdev@vger.kernel.org
  S:	Orphan