Unverified Commit 3f96885e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.17-2' of... 

Merge tag 'imx-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

 into arm/fixes

i.MX fixes for 5.17, round 2:

- Drop reset signal from i.MX8MM vpumix power domain to fix a system
  hang.
- Fix a dtbs_check warning caused by #thermal-sensor-cells in i.MX8ULP
  device tree.
- Fix a clock disabling imbalance in gpcv2 driver.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 31c50bf1 fa231bef

Documentation/dev-tools/kunit/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ example: 


	int rectangle_area(struct shape *this)

	{

		struct rectangle *self = container_of(this, struct shape, parent);

		struct rectangle *self = container_of(this, struct rectangle, parent);



		return self->length * self->width;

	};

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

+15 −6
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ description: 
  contains a specific memory layout, which is documented in chapter 8 of the

  SiFive U5 Coreplex Series Manual <https://static.dev.sifive.com/U54-MC-RVCoreIP.pdf>.



  The thead,c900-plic is different from sifive,plic-1.0.0 in opensbi, the

  T-HEAD PLIC implementation requires setting a delegation bit to allow access

  from S-mode. So add thead,c900-plic to distinguish them.



maintainers:

  - Sagar Kadam <sagar.kadam@sifive.com>

  - Paul Walmsley  <paul.walmsley@sifive.com>
@@ -42,12 +46,17 @@ maintainers: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - sifive,fu540-c000-plic

              - starfive,jh7100-plic

              - canaan,k210-plic

          - const: sifive,plic-1.0.0

      - items:

          - enum:

              - allwinner,sun20i-d1-plic

          - const: thead,c900-plic



  reg:

    maxItems: 1

MAINTAINERS

+19 −5
Original line number Diff line number Diff line
@@ -7581,6 +7581,12 @@ S: Maintained 
W:	http://floatingpoint.sourceforge.net/emulator/index.html

F:	arch/x86/math-emu/









FRAMEBUFFER CORE









M:	Daniel Vetter <daniel@ffwll.ch>









F:	drivers/video/fbdev/core/









S:	Odd Fixes









T:	git git://anongit.freedesktop.org/drm/drm-misc

















FRAMEBUFFER LAYER









M:	Helge Deller <deller@gmx.de>









L:	linux-fbdev@vger.kernel.org








@@ -13309,8 +13315,8 @@ W:	http://www.iptables.org/







W:	http://www.nftables.org/









Q:	http://patchwork.ozlabs.org/project/netfilter-devel/list/









C:	irc://irc.libera.chat/netfilter









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git









F:	include/linux/netfilter*









F:	include/linux/netfilter/









F:	include/net/netfilter/








@@ -13577,7 +13583,7 @@ F:	tools/testing/selftests/nci/















NFS, SUNRPC, AND LOCKD CLIENTS









M:	Trond Myklebust <trond.myklebust@hammerspace.com>









M:	Anna Schumaker <anna.schumaker@netapp.com>









M:	Anna Schumaker <anna@kernel.org>









L:	linux-nfs@vger.kernel.org









S:	Maintained









W:	http://client.linux-nfs.org








@@ -16827,8 +16833,8 @@ F:	drivers/video/fbdev/savage/







S390









M:	Heiko Carstens <hca@linux.ibm.com>









M:	Vasily Gorbik <gor@linux.ibm.com>









M:	Christian Borntraeger <borntraeger@linux.ibm.com>









R:	Alexander Gordeev <agordeev@linux.ibm.com>









M:	Alexander Gordeev <agordeev@linux.ibm.com>









R:	Christian Borntraeger <borntraeger@linux.ibm.com>









R:	Sven Schnelle <svens@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported








@@ -19621,6 +19627,14 @@ F:	Documentation/trace/timerlat-tracer.rst







F:	Documentation/trace/hwlat_detector.rst









F:	arch/*/kernel/trace.c

















Real-time Linux Analysis (RTLA) tools









M:	Daniel Bristot de Oliveira <bristot@kernel.org>









M:	Steven Rostedt <rostedt@goodmis.org>









L:	linux-trace-devel@vger.kernel.org









S:	Maintained









F:	Documentation/tools/rtla/









F:	tools/tracing/rtla/

















TRADITIONAL CHINESE DOCUMENTATION









M:	Hu Haowen <src.res@email.cn>









L:	linux-doc-tw-discuss@lists.sourceforge.net

























Makefile



+2
−2






























Original line number
Diff line number
Diff line







@@ -2,8 +2,8 @@







VERSION = 5









PATCHLEVEL = 17









SUBLEVEL = 0









EXTRAVERSION = -rc3









NAME = Gobble Gobble









EXTRAVERSION = -rc4









NAME = Superb Owl



















# *DOCUMENTATION*









# To see a list of typical targets execute "make help"
































arch/arm64/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -672,6 +672,7 @@ config ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE

















config ARM64_ERRATUM_2051678









	bool "Cortex-A510: 2051678: disable Hardware Update of the page table dirty bit"









	default y









	help









	  This options adds the workaround for ARM Cortex-A510 erratum ARM64_ERRATUM_2051678.









	  Affected Coretex-A510 might not respect the ordering rules for