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:   Thu, 17 Jun 2021 09:24:33 +0200
From:   Johan Hovold <johan@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Pho Tran <pho.tran@silabs.com>, Stefan Agner <stefan@agner.ch>,
        Tung Pham <tung.pham@silabs.com>
Subject: Re: linux-next: manual merge of the usb-serial tree with Linus' tree
Message-ID: <YMr4sYHUNiGrjB8P@hovoldconsulting.com>
References: <20210617150224.19213166@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="ryjozJGk4o7WYpH/"
Content-Disposition: inline
In-Reply-To: <20210617150224.19213166@canb.auug.org.au>
Precedence: bulk


--ryjozJGk4o7WYpH/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jun 17, 2021 at 03:02:24PM +1000, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the usb-serial tree got a conflict in:
>=20
>   drivers/usb/serial/cp210x.c
>=20
> between commit:
>=20
>   6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N =
QFN20")
>=20
> from Linus' tree and commit:
>=20
>   8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108")
>=20
> from the usb-serial tree.
>=20
> 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.

Thanks, looks good.

Johan

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

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

iHUEABYIAB0WIQQHbPq+cpGvN/peuzMLxc3C7H1lCAUCYMr4qQAKCRALxc3C7H1l
CGrNAQCwkFz1f3N3MP+mkAJVHqoOIzGaGYlbA5RR/omLbW91kwEAnJX4plxwldbT
XfshzbSvSlPH5yLf9N9ypudASw8AzA8=
=Ngpi
-----END PGP SIGNATURE-----

--ryjozJGk4o7WYpH/--