]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
Merge tag 'memory-controller-drv-6.13' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 4 Nov 2024 13:25:14 +0000 (14:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 4 Nov 2024 13:25:15 +0000 (14:25 +0100)
commit9753ab5b97b9b5b8ecc5dcaaab5fff09af4aab17
tree08dbf1dd7280fa9c526337821ad342475d5a10f1
parent2570a2449416e3fea4968f07d88d1c6166a85af0
parent1f1d847a657523e182df87f88158b607afe7d559
Merge tag 'memory-controller-drv-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers

Memory controller drivers for v6.13

1. Freescale IFC: Split handling of child nodes in the bindings to
   fix dtbs_check warning.
2. ARM64 defconfig: Nothing selects CONFIG_FSL_IFC anymore since
   commit 9ba0cae3cac0 ("memory: fsl_ifc: Make FSL_IFC config visible
   and selectable") and actually CONFIG_MTD_NAND_FSL_IFC depends on it
   now.  Enable CONFIG_FSL_IFC in ARM64 defconfig, so users of it won't
   lose these two drivers.

* tag 'memory-controller-drv-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  arm64: defconfig: Update defconfig with now user-visible CONFIG_FSL_IFC
  dt-bindings: memory-controllers: fsl,ifc: split child node differences

Link: https://lore.kernel.org/r/20241029075348.19580-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>