Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 21 Sep 2022 08:32:14 +0200
From:   Johan Hovold <johan@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Greg KH <greg@kroah.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Ilpo =?utf-8?B?SsOkcnZpbmVu?= <ilpo.jarvinen@linux.intel.com>,
        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 usb-serial tree
Message-ID: <Yyqv7rwuy3dedbqI@hovoldconsulting.com>
References: <20220921151109.174cad24@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="mMFeO+J6G+9SD2f2"
Content-Disposition: inline
In-Reply-To: <20220921151109.174cad24@canb.auug.org.au>
Precedence: bulk


--mMFeO+J6G+9SD2f2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Sep 21, 2022 at 03:11:09PM +1000, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the tty tree got a conflict in:
>=20
>   drivers/usb/serial/ftdi_sio.c
>=20
> between commit:
>=20
>   a8619505a778 ("USB: serial: ftdi_sio: move driver structure")
>=20
> from the usb-serial tree and commit:
>=20
>   f6d47fe5921a ("usb: serial: Make ->set_termios() old ktermios const")
>=20
> from the tty 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.

Looks good. Thanks for the heads-up.

Johan

--mMFeO+J6G+9SD2f2
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYIAB0WIQQHbPq+cpGvN/peuzMLxc3C7H1lCAUCYyqv5gAKCRALxc3C7H1l
CM9QAQDCjz9Hkb6MIXN/oNp9h2S/r7htSlL5C8tiIAyg5MOyvwD/dMaYY/0Yi+na
fPTEgcLoOpv1gOgWJSWItDmzYlYIyQc=
=5KBK
-----END PGP SIGNATURE-----

--mMFeO+J6G+9SD2f2--