linux-next: manual merge of the gpio-brgl tree with the origin tree

[Mark Brown]

Hi all,

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

  drivers/gpio/gpio-mxc.c

between commit:

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

from the origin tree and commit:

  569d0a6f57fc1 ("gpio: mxc: use local dev variable")

from the gpio-brgl 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/gpio/gpio-mxc.c
index 7dabe8073dc65,1fdbbc9617aa9..0000000000000
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -425,7 -479,7 +479,7 @@@ static int mxc_gpio_probe(struct platfo
  	int irq_base;
  	int err;
  
- 	port = devm_kzalloc_obj(&pdev->dev, *port);
 -	port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
++	port = devm_kzalloc_obj(dev, *port);
  	if (!port)
  		return -ENOMEM;

Attachment: signature.asc
Description: PGP signature