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 0D780C54EBC for ; Thu, 12 Jan 2023 12:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234309AbjALMC5 (ORCPT ); Thu, 12 Jan 2023 07:02:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233381AbjALMCV (ORCPT ); Thu, 12 Jan 2023 07:02:21 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B68D511A2F; Thu, 12 Jan 2023 03:57:03 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 76E482B; Thu, 12 Jan 2023 03:57:45 -0800 (PST) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4578F3F67D; Thu, 12 Jan 2023 03:57:02 -0800 (PST) Date: Thu, 12 Jan 2023 11:56:59 +0000 From: Andre Przywara To: Paolo Abeni Cc: Jakub Kicinski , "David S . Miller" , Eric Dumazet , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg KH Subject: Re: [PATCH net-next] r8152: add vendor/device ID pair for Microsoft Devkit Message-ID: <20230112115659.27fb453d@donnerap.cambridge.arm.com> In-Reply-To: <4c48269962dafbb641d5b0c38ec5b7bf951f3b4d.camel@redhat.com> References: <20230111133228.190801-1-andre.przywara@arm.com> <20230111213143.71f2ad7e@kernel.org> <20230112105137.7b09e70b@donnerap.cambridge.arm.com> <4c48269962dafbb641d5b0c38ec5b7bf951f3b4d.camel@redhat.com> Organization: ARM X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Thanks, Andre