linux-kernel - Re: linux-next: manual merge of the usb-serial tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YMr4sYHUNiGrjB8P@hovoldconsulting.com>
Date:   Thu, 17 Jun 2021 09:24:33 +0200
From:   Johan Hovold <johan@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Pho Tran <pho.tran@...abs.com>, Stefan Agner <stefan@...er.ch>,
        Tung Pham <tung.pham@...abs.com>
Subject: Re: 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

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)