linux-next: manual merge of the imx-mxs tree with the origin tree

linux-next: manual merge of the imx-mxs tree with the origin tree

[Mark Brown]

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

Hi all,

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

  drivers/firmware/imx/imx-scu-irq.c

between commit:

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

from the origin tree and commit:

  f144d9f031b01 ("firmware: imx: scu: publish the SCU IPC handles with release semantics")

from the imx-mxs 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/imx/imx-scu-irq.c
index bc22b10ddb20f,4f24e3c08a652..0000000000000
--- a/drivers/firmware/imx/imx-scu-irq.c
+++ b/drivers/firmware/imx/imx-scu-irq.c
@@@ -219,7 -223,15 +223,15 @@@ int imx_scu_enable_general_irq_channel(
  	if (ret)
  		return ret;
  
+ 	/*
+ 	 * imx_scu_irq_group_enable() tests imx_sc_irq_ipc_handle from other
+ 	 * drivers' probe paths and then passes it to imx_scu_call_rpc().
+ 	 * Publish it with release semantics so that the SCU state it points
+ 	 * to is visible to them.
+ 	 */
+ 	smp_store_release(&imx_sc_irq_ipc_handle, ipc);
+ 
 -	cl = devm_kzalloc(dev, sizeof(*cl), GFP_KERNEL);
 +	cl = devm_kzalloc_obj(dev, *cl);
  	if (!cl)
  		return -ENOMEM;
  

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