lkml.org 
[lkml]   [2021]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the usb-serial tree with Linus' tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-06-17 09:25    [W:0.039 / U:0.556 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site