Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Mon, 27 Nov 2023 11:49:04 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Michael Ellerman <mpe@ellerman.id.au>
Cc:     PowerPC <linuxppc-dev@lists.ozlabs.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>
Subject: linux-next: manual merge of the tty tree with the powerpc tree
Message-ID: <20231127114904.77f7efb6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/s_bmlMboQn5EzX+dtDeXWmA";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/s_bmlMboQn5EzX+dtDeXWmA
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/tty/hvc/hvc_console.h

between commit:

  c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")

from the powerpc tree and commit:

  7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")

from the tty tree.

These are slightly different versions of the same patch.

I fixed it up (I used the former version (removed "extern" from a function
declaration)) 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

--Sig_/s_bmlMboQn5EzX+dtDeXWmA
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVj54AACgkQAVBC80lX
0GxMywgAk/KriTf1x1WfY+DGKeTl2pHJPX7vqhJVQjUH5B2KlePP04tpJ4LlJOa+
OArcCKA49+0eAMPlSJq+pTavBg9Mz8sp6uHOXq6J5TZMae8DzMDba1FmeLy6+dOx
q4F4nOfGY0d/eCLSbfupoKYPCkoMoyTt9ODGF1GsvQsbina13x7reQVw//bwdJ9Y
jViyH2rfeWMWzsZGyQ9OUObxOBmo63SFxsNyWSYR4bQt+sZ03/TRi+5Bx8nFQcJ1
+xuQp4fK4FKc98wtQAKxOsyF0gjaAZr+Hsbi+fxg6YGAaLkPN0A1j7StjMhYeuDe
YC2/oWHfkcGBAJtpiW/adAxFULACiA==
=1s/D
-----END PGP SIGNATURE-----

--Sig_/s_bmlMboQn5EzX+dtDeXWmA--