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