Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 25 Jan 2021 09:05:06 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Stafford Horne <shorne@gmail.com>
Cc:     Geert Uytterhoeven <geert@linux-m68k.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the openrisc tree with Linus' tree
Message-ID: <20210125090506.35337fa2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GvgoFc4q3A+zIU0FsE=e7Z_";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/GvgoFc4q3A+zIU0FsE=e7Z_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 co=
nfigured")

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.

--=20
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=20
 =20
  struct litex_soc_ctrl_device {
  	void __iomem *base;
+ 	struct notifier_block reset_nb;
  };
 =20
+ static int litex_reset_handler(struct notifier_block *this, unsigned long=
 mode,
+ 			       void *cmd)
+ {
+ 	struct litex_soc_ctrl_device *soc_ctrl_dev =3D
+ 		container_of(this, struct litex_soc_ctrl_device, reset_nb);
+=20
+ 	litex_write32(soc_ctrl_dev->base + RESET_REG_OFF, RESET_REG_VALUE);
+ 	return NOTIFY_DONE;
+ }
+=20
 +#ifdef CONFIG_OF
  static const struct of_device_id litex_soc_ctrl_of_match[] =3D {
  	{.compatible =3D "litex,soc-controller"},
  	{},

--Sig_/GvgoFc4q3A+zIU0FsE=e7Z_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAN7xIACgkQAVBC80lX
0GzIgwgAlCPGqjyURgCzRiUnovoqc/ldma2LktTgPsgSVNxLFvstMyuI3bMfqN+4
MgGG9JGNjhSqX+jBD0tXPSWNt2s+knTwnZVDWvo3eCEs+UXhWclLnNrszHs3JP9q
vxuDrxkUoJwdgm2ShB+ClF8dUiDcIEXVBDyBffSEdqSs6JElQdMIvCScKGJ7yf2L
CVO3Gojm04cNjYOYVzuLJF5Mb2PKy/Q+4EaD8TiEg4JZ+ABdLq+wT8JHsP9aKr0N
TA01suGmS5v+QRkYsKzo7STyGn4FX7zQ+nOeVeizF5xbOzx+7dZcir9IJ7drojg3
l2srytkeENcWGC0lNJKG6l+yuOF9SA==
=TAFP
-----END PGP SIGNATURE-----

--Sig_/GvgoFc4q3A+zIU0FsE=e7Z_--