linux-next: manual merge of the char-misc tree with the broadcom tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/firmware/raspberrypi.c

between commit:

  117bd98daca0 ("firmware: raspberrypi: Use dev_err_probe() to simplify code")

from the broadcom tree and commit:

  7b51161696e8 ("firmware: raspberrypi: fix possible memory leak in rpi_firmware_probe()")

from the char-misc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/firmware/raspberrypi.c
index ec07bf26e5eb,dba315f675bc..000000000000
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@@ -288,9 -268,13 +288,11 @@@ static int rpi_firmware_probe(struct pl
  	fw->cl.tx_block = true;
  
  	fw->chan = mbox_request_channel(&fw->cl, 0);
- 	if (IS_ERR(fw->chan))
- 		return dev_err_probe(dev, PTR_ERR(fw->chan),
- 				     "Failed to get mbox channel\n");
+ 	if (IS_ERR(fw->chan)) {
+ 		int ret = PTR_ERR(fw->chan);
 -		if (ret != -EPROBE_DEFER)
 -			dev_err(dev, "Failed to get mbox channel: %d\n", ret);
+ 		kfree(fw);
 -		return ret;
++		return dev_err_probe(dev, ret, "Failed to get mbox channel\n");
+ 	}
  
  	init_completion(&fw->c);
  	kref_init(&fw->consumers);

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