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
Date: Thu, 17 Jun 2021 09:24:33 +0200 [thread overview]
Message-ID: <YMr4sYHUNiGrjB8P@hovoldconsulting.com> (raw)
In-Reply-To: <20210617150224.19213166@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 871 bytes --]
On Thu, Jun 17, 2021 at 03:02:24PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb-serial tree got a conflict in:
>
> drivers/usb/serial/cp210x.c
>
> between commit:
>
> 6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20")
>
> from Linus' tree and commit:
>
> 8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108")
>
> from the usb-serial 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.
Thanks, looks good.
Johan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2021-06-17 7:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 5:02 linux-next: manual merge of the usb-serial tree with Linus' tree Stephen Rothwell
2021-06-17 7:24 ` 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=YMr4sYHUNiGrjB8P@hovoldconsulting.com \
--to=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pho.tran@silabs.com \
--cc=sfr@canb.auug.org.au \
--cc=stefan@agner.ch \
--cc=tung.pham@silabs.com \
/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;
as well as URLs for NNTP newsgroup(s).