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

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

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

Hi all,

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

  drivers/firmware/stratix10-svc.c

between commit:

  d0fcf70c680e ("firmware: stratix10-svc: fix bug in saving controller data")

from the char-misc.current tree and commit:

  bcb9f4f07061 ("firmware: stratix10-svc: Add support for async communication")

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/stratix10-svc.c
index 00f58e27f6de,3acfa067c5dd..000000000000
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@@ -134,7 -255,7 +255,8 @@@ struct stratix10_async_ctrl 
   * @complete_status: state for completion
   * @svc_fifo_lock: protect access to service message data queue
   * @invoke_fn: function to issue secure monitor call or hypervisor call
 + * @svc: manages the list of client svc drivers
+  * @actrl: async control structure
   *
   * This struct is used to create communication channels for service clients, to
   * handle secure monitor or hypervisor call.
@@@ -151,7 -272,7 +273,8 @@@ struct stratix10_svc_controller 
  	struct completion complete_status;
  	spinlock_t svc_fifo_lock;
  	svc_invoke_fn *invoke_fn;
 +	struct stratix10_svc *svc;
+ 	struct stratix10_async_ctrl actrl;
  };
  
  /**
@@@ -1257,9 -2002,11 +2003,11 @@@ err_destroy_pool
  
  static void stratix10_svc_drv_remove(struct platform_device *pdev)
  {
 -	struct stratix10_svc *svc = dev_get_drvdata(&pdev->dev);
  	struct stratix10_svc_controller *ctrl = platform_get_drvdata(pdev);
 +	struct stratix10_svc *svc = ctrl->svc;
  
+ 	stratix10_svc_async_exit(ctrl);
+ 
  	of_platform_depopulate(ctrl->dev);
  
  	platform_device_unregister(svc->intel_svc_fcs);

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