Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3505978pxf; Mon, 15 Mar 2021 11:02:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvDfKXj6/JgE2/IlNoJ95vCSKP6y/tzeqWG1lsepL215VLwJOPjn1us2EG/6MV6tIEsHhi X-Received: by 2002:a17:906:828e:: with SMTP id h14mr25485502ejx.529.1615831372350; Mon, 15 Mar 2021 11:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615831372; cv=none; d=google.com; s=arc-20160816; b=e1Gtf4yhhtrFa1goPU+QhrruQ/CwLZ7OgFW/RMU+Df5N6MH7iq6fh88iQZAT5Prf67 IKTojSJfQIqHdJiuxI4dwFbuZPoWDKuHUU62u0uR/UIghvdbh3IjlwGiw56TtafLZLHN PTVRETbvSKw1RdxzyPTCGFPmAJzKhA90pKKoPV+m7rYQXsdw9BVv7nxBPlJSWfTpQrlV H4vgRtn+e2ccGP/KiVBeOv047ggjN/F0PQA3j5nlntJDbpv6NFD1fHaTJq6ynFavYlGq XDovBeW89wOUtlGCEyJI3We4KsLRazS6y/2VBCnpXm4VpAWoARFr/dV+yJQmozeaY3yd wadg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uIQa1qZE0OGBxzJZSWef/nC7Nw0XXhzhier7LGdm2qY=; b=YYrOqiu/+Pteg1OisTkyZ5GnJvmK4YDISZKpzm4v9ArNXL4RmjMdhfQL+DXXFbOkfa l3XIPYa7wxvHD3Qa4WX1MCGA3iW2E4VROAj/wVrc64RPwXCRJtrZKvelQqaLUlstVMgB mSpURl2WfVi+1bkyZDtQWKbQ6vJCIh0AqTRF0eNzsvPRgKSN+/SRoShbB0/g4U2t807U MLwwJUsAfNU73KxhrsZyJs1+Qc/DBtQHE6q9fAnIvo81lTeRLUZsmkeCUNrCG6fXzO6Q Bkm7bCnhivGjEGrYmW+8JEmQKRIClAXqvNM5nKH4pYdYZrRUIANWDNrtqaTuFvSjn2kp 4k1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sYdnnVRe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hp15si11634332ejc.548.2021.03.15.11.02.29; Mon, 15 Mar 2021 11:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sYdnnVRe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234804AbhCOOGM (ORCPT + 99 others); Mon, 15 Mar 2021 10:06:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:35038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230290AbhCON5c (ORCPT ); Mon, 15 Mar 2021 09:57:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5A35C64EED; Mon, 15 Mar 2021 13:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816651; bh=MHqxtauWUZmnwi1hBw6ubfs75cX/l+DmR8i5N+NavgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sYdnnVReLAR7ZLl9Y1lihgGZQzd8czkumWOgUeT2v/XrHMYmhkRV6cWUXECWfZcHm BJA6D+avPKyAQBXDk5/YQBW83Zm2tcjN4sKyQCCgsqMXr7v4vrnf7XL58D247i0PCT GoP+wdrvyAiVjeUOnbX1gZjyhTc8dZm3vwValbjw= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , "David S. Miller" Subject: [PATCH 5.10 034/290] docs: networking: drop special stable handling Date: Mon, 15 Mar 2021 14:52:07 +0100 Message-Id: <20210315135543.076297906@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Jakub Kicinski commit dbbe7c962c3a8163bf724dbc3c9fdfc9b16d3117 upstream. Leave it to Greg. Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- Documentation/networking/netdev-FAQ.rst | 78 ++------------------------ Documentation/process/stable-kernel-rules.rst | 6 -- Documentation/process/submitting-patches.rst | 5 - 3 files changed, 7 insertions(+), 82 deletions(-) --- a/Documentation/networking/netdev-FAQ.rst +++ b/Documentation/networking/netdev-FAQ.rst @@ -144,77 +144,13 @@ Please send incremental versions on top the patches the way they would look like if your latest patch series was to be merged. -Q: How can I tell what patches are queued up for backporting to the various stable releases? --------------------------------------------------------------------------------------------- -A: Normally Greg Kroah-Hartman collects stable commits himself, but for -networking, Dave collects up patches he deems critical for the -networking subsystem, and then hands them off to Greg. - -There is a patchworks queue that you can see here: - - https://patchwork.kernel.org/bundle/netdev/stable/?state=* - -It contains the patches which Dave has selected, but not yet handed off -to Greg. If Greg already has the patch, then it will be here: - - https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git - -A quick way to find whether the patch is in this stable-queue is to -simply clone the repo, and then git grep the mainline commit ID, e.g. -:: - - stable-queue$ git grep -l 284041ef21fdf2e - releases/3.0.84/ipv6-fix-possible-crashes-in-ip6_cork_release.patch - releases/3.4.51/ipv6-fix-possible-crashes-in-ip6_cork_release.patch - releases/3.9.8/ipv6-fix-possible-crashes-in-ip6_cork_release.patch - stable/stable-queue$ - -Q: I see a network patch and I think it should be backported to stable. ------------------------------------------------------------------------ -Q: Should I request it via stable@vger.kernel.org like the references in -the kernel's Documentation/process/stable-kernel-rules.rst file say? -A: No, not for networking. Check the stable queues as per above first -to see if it is already queued. If not, then send a mail to netdev, -listing the upstream commit ID and why you think it should be a stable -candidate. - -Before you jump to go do the above, do note that the normal stable rules -in :ref:`Documentation/process/stable-kernel-rules.rst ` -still apply. So you need to explicitly indicate why it is a critical -fix and exactly what users are impacted. In addition, you need to -convince yourself that you *really* think it has been overlooked, -vs. having been considered and rejected. - -Generally speaking, the longer it has had a chance to "soak" in -mainline, the better the odds that it is an OK candidate for stable. So -scrambling to request a commit be added the day after it appears should -be avoided. - -Q: I have created a network patch and I think it should be backported to stable. --------------------------------------------------------------------------------- -Q: Should I add a Cc: stable@vger.kernel.org like the references in the -kernel's Documentation/ directory say? -A: No. See above answer. In short, if you think it really belongs in -stable, then ensure you write a decent commit log that describes who -gets impacted by the bug fix and how it manifests itself, and when the -bug was introduced. If you do that properly, then the commit will get -handled appropriately and most likely get put in the patchworks stable -queue if it really warrants it. - -If you think there is some valid information relating to it being in -stable that does *not* belong in the commit log, then use the three dash -marker line as described in -:ref:`Documentation/process/submitting-patches.rst ` -to temporarily embed that information into the patch that you send. - -Q: Are all networking bug fixes backported to all stable releases? ------------------------------------------------------------------- -A: Due to capacity, Dave could only take care of the backports for the -last two stable releases. For earlier stable releases, each stable -branch maintainer is supposed to take care of them. If you find any -patch is missing from an earlier stable branch, please notify -stable@vger.kernel.org with either a commit ID or a formal patch -backported, and CC Dave and other relevant networking developers. +Q: Are there special rules regarding stable submissions on netdev? +--------------------------------------------------------------- +While it used to be the case that netdev submissions were not supposed +to carry explicit ``CC: stable@vger.kernel.org`` tags that is no longer +the case today. Please follow the standard stable rules in +:ref:`Documentation/process/stable-kernel-rules.rst `, +and make sure you include appropriate Fixes tags! Q: Is the comment style convention different for the networking content? ------------------------------------------------------------------------ --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -35,12 +35,6 @@ Rules on what kind of patches are accept Procedure for submitting patches to the -stable tree ---------------------------------------------------- - - If the patch covers files in net/ or drivers/net please follow netdev stable - submission guidelines as described in - :ref:`Documentation/networking/netdev-FAQ.rst ` - after first checking the stable networking queue at - https://patchwork.kernel.org/bundle/netdev/stable/?state=* - to ensure the requested patch is not already queued up. - Security patches should not be handled (solely) by the -stable review process but should follow the procedures in :ref:`Documentation/admin-guide/security-bugs.rst `. --- a/Documentation/process/submitting-patches.rst +++ b/Documentation/process/submitting-patches.rst @@ -250,11 +250,6 @@ should also read :ref:`Documentation/process/stable-kernel-rules.rst ` in addition to this file. -Note, however, that some subsystem maintainers want to come to their own -conclusions on which patches should go to the stable trees. The networking -maintainer, in particular, would rather not see individual developers -adding lines like the above to their patches. - If changes affect userland-kernel interfaces, please send the MAN-PAGES maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at least a notification of the change, so that some information makes its way