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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B0E8C54EBD for ; Thu, 12 Jan 2023 13:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233062AbjALNJp (ORCPT ); Thu, 12 Jan 2023 08:09:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231560AbjALNJm (ORCPT ); Thu, 12 Jan 2023 08:09:42 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A691D51320 for ; Thu, 12 Jan 2023 05:08:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673528938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nCRS/MpkyPeaVrlVLdkBcx6JcO4jj78Pqfq4rjjeatI=; b=dSP+GfkcK+FNkoMF7B0v8fqIVbBug4pISHwTK4HMHzDYVFW865TaazM5pBpmOhduo1ju0x sPqrhWC+4cWmoiyCr27a+JSND5sb9bPveZPj5z8cMLXdMNXpEwqGal7LFG/26anDh/HKj9 zbmkqYjvevh5Owku1SG3AW0ecewdyGc= Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-215-So4eDxYIMLmNS7bBEaCLPg-1; Thu, 12 Jan 2023 08:08:57 -0500 X-MC-Unique: So4eDxYIMLmNS7bBEaCLPg-1 Received: by mail-yb1-f197.google.com with SMTP id a14-20020a5b0ace000000b007bf99065fcbso11218724ybr.2 for ; Thu, 12 Jan 2023 05:08:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=nCRS/MpkyPeaVrlVLdkBcx6JcO4jj78Pqfq4rjjeatI=; b=APanvqS+bixEw2ijn/dpqjK4IkVlaXfnRsXVLnnqresWyd6F7rF8+Cb8xjFAXe6oEw VhQWAXA3kjlEo3v/5OPFlr12PDVxMHMMIgVh00zfBfd9ofbIo6KMvwlNfMa8Od5vniZY 3+aKo2OmUhhLt5nL0RCCkOiQzlkX+Zvy7UUVFT1L1GweR3mQIRh0bd+Ms2dHCWqTt8vb LjCT/yt5Wnev8/8Sa4pF0SEcYQQ30Hcli3yHVCtqQr5ncLihAUsS/jbMlXj+nHlasH3x VWwqoxlnHA/vCHXzleOT/VvqcJ4Ju4UMdpbzHQHUlPfAIUmF7IBqq3y/+mBqQuLyZXvu h3tA== X-Gm-Message-State: AFqh2kpAUincystbwTEmDpOPaNL+kVgeHf+Epu0QZWChVO24asnh0M+N LCcxCJrf+7atDYRA1nfJOFHGmm9MCLN2lY6FFS/Yx1jVmHEbdOjgYytPEJKgiZmwpHnbC/CaWDG EmXpizJrOniPN0q22Q7VchkaZ X-Received: by 2002:a05:7500:16cc:b0:f0:4692:cc0 with SMTP id ce12-20020a05750016cc00b000f046920cc0mr1298089gab.28.1673528937050; Thu, 12 Jan 2023 05:08:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXtVkkADuVZjTJe4BA/F7Hbb10OyHI3PlW0oPb18BdiV3GHvC5tzK1mPBMMc0FP3iW/BXGLyqQ== X-Received: by 2002:a05:7500:16cc:b0:f0:4692:cc0 with SMTP id ce12-20020a05750016cc00b000f046920cc0mr1298060gab.28.1673528936660; Thu, 12 Jan 2023 05:08:56 -0800 (PST) Received: from gerbillo.redhat.com (146-241-113-183.dyn.eolo.it. [146.241.113.183]) by smtp.gmail.com with ESMTPSA id j9-20020a05620a288900b006f9f714cb6asm10549640qkp.50.2023.01.12.05.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 05:08:56 -0800 (PST) Message-ID: Subject: Re: [PATCH net-next] r8152: add vendor/device ID pair for Microsoft Devkit From: Paolo Abeni To: Andre Przywara Cc: Jakub Kicinski , "David S . Miller" , Eric Dumazet , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg KH Date: Thu, 12 Jan 2023 14:08:53 +0100 In-Reply-To: <20230112115659.27fb453d@donnerap.cambridge.arm.com> References: <20230111133228.190801-1-andre.przywara@arm.com> <20230111213143.71f2ad7e@kernel.org> <20230112105137.7b09e70b@donnerap.cambridge.arm.com> <4c48269962dafbb641d5b0c38ec5b7bf951f3b4d.camel@redhat.com> <20230112115659.27fb453d@donnerap.cambridge.arm.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.4 (3.42.4-2.fc35) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2023-01-12 at 11:56 +0000, Andre Przywara wrote: > On Thu, 12 Jan 2023 12:39:01 +0100 > Paolo Abeni wrote: > > Hi, > > > On Thu, 2023-01-12 at 10:51 +0000, Andre Przywara wrote: > > > On Wed, 11 Jan 2023 21:31:43 -0800 Jakub Kicinski wrote: > > > > Hm, we have a patch in net-next which reformats the entries: > > > > ec51fbd1b8a2bca2948dede99c14ec63dc57ff6b > > > > > > > > Would you like this ID to be also added in stable? We could just > > > > apply it to net, and deal with the conflict locally. But if you > > > > don't care about older kernels then better if you rebase. > > > > > > Stable would be nice, but only to v6.1. I think I don't care > > > about older kernels. > > > So what about if I resend this one here, based on top of the reformat > > > patch, with a: > > > Cc: # 6.1.x > > > line in there, and then reply to the email that the automatic backport > > > failed, with a tailored patch for v6.1? > > > Alternatively I can send an explicit stable backport email once this one > > > is merged. > > > > Note that we can merge this kind of changes via the -net tree. No > > repost will be needed. We can merge it as is on -net and you can follow > > the option 2 from the stable kernel rules doc, with no repost nor > > additional mangling for stable will be needed. > > > > If you are ok with the above let me know. > > That sounds good to me, but that will then trigger a merge conflict when > net-next (with the reformat patch) is merged? I guess it's easy enough to > solve, but that would be extra work on your side. If you are fine with > that, it's OK for me. Fine by us (well, probably poor Jakub will end-up handling the conflict, but AFAIK he is ok with this specific case). I'll merge the patch on net. Cheers, Paolo