linux-next: manual merge of the drivers-memory tree with the origin tree

[Mark Brown]

Hi all,

Today's linux-next merge of the drivers-memory tree got a conflict in:

  drivers/memory/tegra/tegra186-emc.c

between commit:

  995832b2cebe6 ("Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)")

from the origin tree and commit:

  5239692170f18 ("memory: tegra: add multi-socket support to the memory interconnect")

from the drivers-memory tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/memory/tegra/tegra186-emc.c
index 2a4cb64c4c4c5,e25f485e136e3..0000000000000
--- a/drivers/memory/tegra/tegra186-emc.c
+++ b/drivers/memory/tegra/tegra186-emc.c
@@@ -3,9 -3,13 +3,12 @@@
   * Copyright (C) 2019-2025 NVIDIA CORPORATION.  All rights reserved.
   */
  
+ #include <linux/cleanup.h>
  #include <linux/clk.h>
  #include <linux/debugfs.h>
+ #include <linux/fs.h>
  #include <linux/module.h>
 -#include <linux/mod_devicetable.h>
+ #include <linux/mutex.h>
  #include <linux/of_platform.h>
  #include <linux/platform_device.h>

Attachment: signature.asc
Description: PGP signature