Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Mon, 27 Nov 2023 12:17:39 +0100
From:   Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
To:     Michael Ellerman <mpe@ellerman.id.au>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
        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>
Subject: Re: linux-next: manual merge of the tty tree with the powerpc tree
Message-ID: <20231127111739.ryvlgofx3b65z2hf@pengutronix.de>
References: <20231127114904.77f7efb6@canb.auug.org.au>
 <877cm34g0l.fsf@mail.lhotse>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="4eyf7rezxjwurju5"
Content-Disposition: inline
In-Reply-To: <877cm34g0l.fsf@mail.lhotse>
Precedence: bulk


--4eyf7rezxjwurju5
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello,

On Mon, Nov 27, 2023 at 10:00:58PM +1100, Michael Ellerman wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> > 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.
>=20
> I'll drop it from my tree.

FTR: Regarding the slightly difference: The variant in the tty tree is
the better one. So nothing to do for Greg (or me) here.

Thanks
Uwe

--=20
Pengutronix e.K.                           | Uwe Kleine-K=F6nig            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

--4eyf7rezxjwurju5
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmVketMACgkQj4D7WH0S
/k6xOgf+NZ2fNHlxIPkzzXeqRV8tvyXxa1uBM2gugQRm+9VBIvNM9m/ywtsM3GKZ
OVSkXb4mWIp1QXXJodmlPBnAyv4+J568aKjSlAAZw3gxzNDJ4pLBTGCJo9L+U3WO
YThzKymrcwwsb9z/L7oL4IiH64KGtQj7uZ6rsuJZFT2zaBJRZJo+Q1VahvQHtakZ
aNo5NRhg2swXKhoAv0LDbxFY6ZmQVxKI6PmoLwzK0f8l8+SeE9fYtxr22minkWDA
48kV91gH/vgx9YjP8MJ1HzRxTssmvkUj6mHwBjz1Vxpd3GuCTK6sm1+Bmf8xnDof
bM0LSRRDZyR47GrqhtUchIMD0mEsTw==
=8Vol
-----END PGP SIGNATURE-----

--4eyf7rezxjwurju5--