Unverified Commit f0473825 authored Feb 06, 2023 by Tudor Ambarus

Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next



Merge 'mtd/fixes-for-6.2-rc4' into spi-nor/next to fix conflict on
include headers in drivers/mtd/spi-nor/core.c.

Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>

parents 893fd950 c0f7ae27

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		.o.
		*.patch
		*.rmeta
		*.rpm
		*.rsi
		*.s
		*.so

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,7 @@ Tony Luck <tony.luck@intel.com>
		TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>
		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
		Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator

		maintainers:
		- Tudor Ambarus <tudor.ambarus@microchip.com>
		- Tudor Ambarus <tudor.ambarus@linaro.org>

		properties:
		compatible:

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Atmel Secure Hash Algorithm (SHA) HW cryptographic accelerator

		maintainers:
		- Tudor Ambarus <tudor.ambarus@microchip.com>
		- Tudor Ambarus <tudor.ambarus@linaro.org>

		properties:
		compatible:

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Atmel Triple Data Encryption Standard (TDES) HW cryptographic accelerator

		maintainers:
		- Tudor Ambarus <tudor.ambarus@microchip.com>
		- Tudor Ambarus <tudor.ambarus@linaro.org>

		properties:
		compatible: