linux-next: manual merge of the mmc tree with the origin tree

linux-next: manual merge of the mmc tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1371 bytes --]

Hi all,

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

  drivers/mmc/host/sdhci-cadence-core.c

between commit:

  4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

  9def07d97097b ("mmc: sdhci-cadence: enable probing from ACPI")

from the mmc 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/mmc/host/sdhci-cadence-core.c
index 16dc64a21dbb0,c5a4fa8e2fc6a..0000000000000
--- a/drivers/mmc/host/sdhci-cadence-core.c
+++ b/drivers/mmc/host/sdhci-cadence-core.c
@@@ -649,8 -650,8 +650,8 @@@ static int sdhci_cdns4_phy_probe(struc
  	struct sdhci_cdns4_phy *phy;
  	unsigned int nr_phy_params;
  
- 	nr_phy_params = sdhci_cdns4_phy_param_count(dev->of_node);
+ 	nr_phy_params = sdhci_cdns4_phy_param_count(dev);
 -	phy = devm_kzalloc(dev, struct_size(phy, phy_params, nr_phy_params), GFP_KERNEL);
 +	phy = devm_kzalloc_flex(dev, *phy, phy_params, nr_phy_params);
  	if (!phy)
  		return -ENOMEM;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]