From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B68DC49EA5 for ; Thu, 24 Jun 2021 10:55:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6624E61405 for ; Thu, 24 Jun 2021 10:55:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232332AbhFXK56 (ORCPT ); Thu, 24 Jun 2021 06:57:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:43722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232330AbhFXK5x (ORCPT ); Thu, 24 Jun 2021 06:57:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E494A613DA; Thu, 24 Jun 2021 10:55:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1624532134; bh=+9sE0LtSPd4C4EdjQzA2+/pCvK+7mLM1hBAY1nGLjcw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=uWhN40NUEAQi61Lu74+1OanSLxMEZoEKFH/2x2FyaESSs8dUmcxBevFwMP3pj56e4 3zciYQ04i8PofFXJmDKvDsb5wcn5WPG6xUGuciCfjPBtRTk2+HMKThFojEaLXpIpAR 2DpzeneLz406OWAgqa5ZsLCN3BbtBtYXZS7oExkQ= Date: Thu, 24 Jun 2021 12:55:31 +0200 From: Greg Kroah-Hartman To: Johan Hovold Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] USB-serial updates for 5.14-rc1 Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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