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

[Mark Brown]

Hi all,

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

  drivers/firmware/tegra/bpmp-tegra210.c

between commit:

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

from the origin tree and commit:

  ee98ea41ee3fb ("firmware: tegra: bpmp: Add ACPI support")

from the tegra 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/firmware/tegra/bpmp-tegra210.c
index a33bb027c8b8d,fdc26c66f7c2f..0000000000000
--- a/drivers/firmware/tegra/bpmp-tegra210.c
+++ b/drivers/firmware/tegra/bpmp-tegra210.c
@@@ -166,7 -166,11 +166,11 @@@ static int tegra210_bpmp_init(struct te
  	unsigned int i;
  	int err;
  
+ 	err = tegra_bpmp_init_channels(bpmp);
+ 	if (err < 0)
+ 		return err;
+ 
 -	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
 +	priv = devm_kzalloc_obj(&pdev->dev, *priv);
  	if (!priv)
  		return -ENOMEM;

Attachment: signature.asc
Description: PGP signature