Commit e58f087e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/fixes-for-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull MTD fixes from Miquel Raynal:

 - cfi: Allow building spi-intel standalone to avoid build issues

 - parsers: scpart: Fix __udivdi3 undefined on mips

 - parsers: tplink_safeloader: Fix potential memory leak during parsing

 - Update email of Tudor Ambarus

* tag 'mtd/fixes-for-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  MAINTAINERS: Update email of Tudor Ambarus
  mtd: cfi: allow building spi-intel standalone
  mtd: parsers: scpart: fix __udivdi3 undefined on mips
  mtd: parsers: Fix potential memory leak in mtd_parser_tplink_safeloader_parse()
parents 23025cbc c0f7ae27

.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:

Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.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 SPI device



maintainers:

  - Tudor Ambarus <tudor.ambarus@microchip.com>

  - Tudor Ambarus <tudor.ambarus@linaro.org>



allOf:

  - $ref: spi-controller.yaml#