From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Feb 2023 20:47:33 +0000 (-0800)
Subject: Merge tag 'char-misc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=693fed981eb9bf6e70bfda66bb872e2bb8155671;p=linux.git

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

Pull char/misc and other driver subsystem updates from Greg KH:
 "Here is the large set of driver changes for char/misc drivers and
  other smaller driver subsystems that flow through this git tree.

  Included in here are:

   - New IIO drivers and features and improvments in that subsystem

   - New hwtracing drivers and additions to that subsystem

   - lots of interconnect changes and new drivers as that subsystem
     seems under very active development recently. This required also
     merging in the icc subsystem changes through this tree.

   - FPGA driver updates

   - counter subsystem and driver updates

   - MHI driver updates

   - nvmem driver updates

   - documentation updates

   - Other smaller driver updates and fixes, full details in the
     shortlog

  All of these have been in linux-next for a while with no reported
  problems"

* tag 'char-misc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (223 commits)
  scripts/tags.sh: fix incompatibility with PCRE2
  firmware: coreboot: Remove GOOGLE_COREBOOT_TABLE_ACPI/OF Kconfig entries
  mei: lower the log level for non-fatal failed messages
  mei: bus: disallow driver match while dismantling device
  misc: vmw_balloon: fix memory leak with using debugfs_lookup()
  nvmem: stm32: fix OPTEE dependency
  dt-bindings: nvmem: qfprom: add IPQ8074 compatible
  nvmem: qcom-spmi-sdam: register at device init time
  nvmem: rave-sp-eeprm: fix kernel-doc bad line warning
  nvmem: stm32: detect bsec pta presence for STM32MP15x
  nvmem: stm32: add OP-TEE support for STM32MP13x
  nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of()
  nvmem: core: add nvmem_add_one_cell()
  nvmem: core: drop the removal of the cells in nvmem_add_cells()
  nvmem: core: move struct nvmem_cell_info to nvmem-provider.h
  nvmem: core: add an index parameter to the cell
  of: property: add #nvmem-cell-cells property
  of: property: make #.*-cells optional for simple props
  of: base: add of_parse_phandle_with_optional_args()
  net: add helper eth_addr_add()
  ...
---

693fed981eb9bf6e70bfda66bb872e2bb8155671
diff --cc MAINTAINERS
index 8bdfe2a131358,69d1e8ad52c57..7e8258e321c1f
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2071,8 -2089,10 +2071,10 @@@ M:	Hartley Sweeten <hsweeten@visionengr
  M:	Alexander Sverdlin <alexander.sverdlin@gmail.com>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
+ F:	Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
 +F:	arch/arm/boot/compressed/misc-ep93xx.h
  F:	arch/arm/mach-ep93xx/
 -F:	arch/arm/mach-ep93xx/include/mach/
+ F:	drivers/iio/adc/ep93xx_adc.c
  
  ARM/CLKDEV SUPPORT
  M:	Russell King <linux@armlinux.org.uk>
@@@ -21788,8 -21866,9 +21833,7 @@@ UUID HELPER
  R:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  L:	linux-kernel@vger.kernel.org
  S:	Maintained
 -T:	git git://git.infradead.org/users/hch/uuid.git
  F:	include/linux/uuid.h
- F:	include/uapi/linux/uuid.h
  F:	lib/test_uuid.c
  F:	lib/uuid.c
  
diff --cc drivers/fpga/dfl.h
index 20eaddce6988b,5fc424d505c82..1d724a28f00ad
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@@ -267,7 -231,7 +267,7 @@@ struct dfl_feature_irq_ctx 
   *
   * @dev: ptr to pdev of the feature device which has the sub feature.
   * @id: sub feature id.
-  * @revision: revisition of the instance of a feature.
 - * @revision: revision value of this sub feature.
++ * @revision: revision of this sub feature.
   * @resource_index: each sub feature has one mmio resource for its registers.
   *		    this index is used to find its mmio resource from the
   *		    feature dev (platform device)'s resources.