linux-next: manual merge of the openrisc tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/soc/litex/litex_soc_ctrl.c

between commit:

  e6dc077b7dff ("soc: litex: Fix compile warning when device tree is not configured")

from Linus' tree and commit:

  3706f9f76a4f ("drivers/soc/litex: Add restart handler")

from the openrisc 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/soc/litex/litex_soc_ctrl.c
index 9b0766384570,a7dd5be9fd5b..000000000000
--- a/drivers/soc/litex/litex_soc_ctrl.c
+++ b/drivers/soc/litex/litex_soc_ctrl.c
@@@ -138,9 -71,19 +71,20 @@@ static int litex_check_csr_access(void 
  
  struct litex_soc_ctrl_device {
  	void __iomem *base;
+ 	struct notifier_block reset_nb;
  };
  
+ static int litex_reset_handler(struct notifier_block *this, unsigned long mode,
+ 			       void *cmd)
+ {
+ 	struct litex_soc_ctrl_device *soc_ctrl_dev =
+ 		container_of(this, struct litex_soc_ctrl_device, reset_nb);
+ 
+ 	litex_write32(soc_ctrl_dev->base + RESET_REG_OFF, RESET_REG_VALUE);
+ 	return NOTIFY_DONE;
+ }
+ 
 +#ifdef CONFIG_OF
  static const struct of_device_id litex_soc_ctrl_of_match[] = {
  	{.compatible = "litex,soc-controller"},
  	{},

Attachment: pgpXfGOycgZ4O.pgp
Description: OpenPGP digital signature