]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'soc_fsl-6.12-3' of https://github.com/chleroy/linux into arm/fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 11 Oct 2024 10:03:13 +0000 (10:03 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 11 Oct 2024 10:03:13 +0000 (10:03 +0000)
FSL SOC fixes for v6.12:

- Fix a "cast to pointer from integer of different size" build error
due to IS_ERROR_VALUE() used with something which is not a pointer.

- Fix an unused data build warning.

* tag 'soc_fsl-6.12-3' of https://github.com/chleroy/linux:
  soc: fsl: cpm1: qmc: Fix unused data compilation warning
  soc: fsl: cpm1: qmc: Do not use IS_ERR_VALUE() on error pointers

Link: https://lore.kernel.org/r/c954bdb0-0c16-491a-8662-37e58f07208f@csgroup.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge