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 Järvinen" <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
Date: Wed, 21 Sep 2022 08:32:14 +0200 [thread overview]
Message-ID: <Yyqv7rwuy3dedbqI@hovoldconsulting.com> (raw)
In-Reply-To: <20220921151109.174cad24@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 867 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2022-09-21 6:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 5:11 linux-next: manual merge of the tty tree with the usb-serial tree Stephen Rothwell
2022-09-21 6:32 ` Johan Hovold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yyqv7rwuy3dedbqI@hovoldconsulting.com \
--to=johan@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox