]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'imx-soc-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Thu, 5 Sep 2024 10:06:18 +0000 (10:06 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 5 Sep 2024 10:06:18 +0000 (10:06 +0000)
i.MX SoC changes for 6.12:

- One cleanup from Fabio Estevam to remove Ethernet refclock setting
  from i.MX6SX machine code
- One change from Nathan Chancellor that annotates imx7d_enet_init() as
  __init to clears up a section mismatch seen with the recent LLVM

* tag 'imx-soc-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Annotate imx7d_enet_init() as __init
  ARM: mach-imx: imx6sx: Remove Ethernet refclock setting

Link: https://lore.kernel.org/r/20240904143439.211552-2-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge