From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Johan Hovold <johan@kernel.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] USB-serial updates for 5.14-rc1
Date: Thu, 24 Jun 2021 12:55:31 +0200 [thread overview]
Message-ID: <YNRko0SG9yPiYPKM@kroah.com> (raw)
In-Reply-To: <YNRJ7D7kVwaLWXe5@hovoldconsulting.com>
On Thu, Jun 24, 2021 at 11:01:32AM +0200, Johan Hovold wrote:
> Hi Greg,
>
> Here are the USB serial updates for 5.14-rc1.
>
> Note that you'll get a merge conflict in cp210x between
>
> 6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20")
>
> which is already in your tree and
>
> 8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108")
>
> This was also reported by Stephen here
>
> https://lore.kernel.org/r/20210617150224.19213166@canb.auug.org.au
>
> and the resolution should be straight forward.
>
> Let me know if you prefer I pull in Linus's rc:s like you do to resolve any
> issues like this in the future.
Not a problem, now pulled and pushed out, thanks.
greg k-h
prev parent reply other threads:[~2021-06-24 10:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 9:01 Johan Hovold
2021-06-24 10:55 ` Greg Kroah-Hartman [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=YNRko0SG9yPiYPKM@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/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
all inboxes | Powered by JetHome®