Re: [GIT PULL] Char/Misc driver updates 5.19-rc1

[Greg KH]

On Fri, Jun 03, 2022 at 12:45:52PM +0200, Greg KH wrote:
> The following changes since commit 672c0c5173427e6b3e2a9bbb7be51ceeec78093a:
> 
>   Linux 5.18-rc5 (2022-05-01 13:57:58 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git tags/char-misc-5.19-rc1
> 
> for you to fetch changes up to 90de6805267f8c79cd2b1a36805071e257c39b5c:
> 
>   habanalabs: use separate structure info for each error collect data (2022-05-22 21:01:21 +0200)
> 
> ----------------------------------------------------------------
> Char / Misc / Other smaller driver subsystem updates for 5.19-rc1
> 
> Here is the large set of char, misc, and other driver subsystem updates
> for 5.19-rc1.  The merge request for this has been delayed as I wanted
> to get lots of linux-next testing due to some late arrivals of changes
> for the habannalabs driver.
> 
> Highlights of this merge are:
> 	- habanalabs driver updates for new hardware types and fixes and
> 	  other updates
> 	- IIO driver tree merge which includes loads of new IIO drivers
> 	  and cleanups and additions
> 	- PHY driver tree merge with new drivers and small updates to
> 	  existing ones
> 	- interconnect driver tree merge with fixes and updates
> 	- soundwire driver tree merge with some small fixes
> 	- coresight driver tree merge with small fixes and updates
> 	- mhi bus driver tree merge with lots of updates and new device
> 	  support
> 	- firmware driver updates
> 	- fpga driver updates
> 	- lkdtm driver updates (with a merge conflict, more on that
> 	  below)
> 	- extcon driver tree merge with small updates
> 	- lots of other tiny driver updates and fixes and cleanups, full
> 	  details in the shortlog.
> 
> All of these have been in linux-next for almost 2 weeks with no reported
> problems.
> 
> Note, there are 3 merge conflicts when merging this with your tree:
> 	- MAINTAINERS, should be easy to resolve
> 	- drivers/slimbus/qcom-ctrl.c, should be straightforward
> 	  resolution
> 	- drivers/misc/lkdtm/stackleak.c, not an easy resolution.  This
> 	  has been noted in the linux-next tree for a while, and
> 	  resolved there, here's a link to the resolution that Stephen
> 	  came up with and that Kees says is correct:
> 	  	https://lore.kernel.org/r/20220509185344.3fe1a354@xxxxxxxxxxxxxxxx
> 
> I will be glad to provide a merge point that contains these resolutions
> if that makes things any easier for you.

I have now done so, and that can be found at:
	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git torvalds_merge

If there are any other issues here, please let me know.

thanks,

greg k-h