From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, pabeni@redhat.com, corbet@lwn.net,
bpf@vger.kernel.org, linux-doc@vger.kernel.org, andrew@lunn.ch,
f.fainelli@gmail.com, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net v2 03/14] docs: netdev: move the patch marking section up
Date: Mon, 28 Mar 2022 22:08:19 -0700 [thread overview]
Message-ID: <20220329050830.2755213-4-kuba@kernel.org> (raw)
In-Reply-To: <20220329050830.2755213-1-kuba@kernel.org>
We want people to mark their patches with net and net-next in the subject.
Many miss doing that. Move the FAQ section which points that out up, and
place it after the section which enumerates the trees, that seems like
a pretty logical place for it. Since the two sections are together we
can remove a little bit (not too much) of the repetition.
v2: also remove the text for non-git setups, we want people to use git.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
Documentation/networking/netdev-FAQ.rst | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/Documentation/networking/netdev-FAQ.rst b/Documentation/networking/netdev-FAQ.rst
index f7e5755e013e..fd5f5a1a0846 100644
--- a/Documentation/networking/netdev-FAQ.rst
+++ b/Documentation/networking/netdev-FAQ.rst
@@ -35,6 +35,17 @@ mainline tree from Linus, and ``net-next`` is where the new code goes
- https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
- https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+How do I indicate which tree (net vs. net-next) my patch should be in?
+----------------------------------------------------------------------
+To help maintainers and CI bots you should explicitly mark which tree
+your patch is targeting. Assuming that you use git, use the prefix
+flag::
+
+ git format-patch --subject-prefix='PATCH net-next' start..finish
+
+Use ``net`` instead of ``net-next`` (always lower case) in the above for
+bug-fix ``net`` content.
+
How often do changes from these trees make it to the mainline Linus tree?
-------------------------------------------------------------------------
To understand this, you need to know a bit of background information on
@@ -90,20 +101,6 @@ and note the top of the "tags" section. If it is rc1, it is early in
the dev cycle. If it was tagged rc7 a week ago, then a release is
probably imminent.
-How do I indicate which tree (net vs. net-next) my patch should be in?
-----------------------------------------------------------------------
-Firstly, think whether you have a bug fix or new "next-like" content.
-Then once decided, assuming that you use git, use the prefix flag, i.e.
-::
-
- git format-patch --subject-prefix='PATCH net-next' start..finish
-
-Use ``net`` instead of ``net-next`` (always lower case) in the above for
-bug-fix ``net`` content. If you don't use git, then note the only magic
-in the above is just the subject text of the outgoing e-mail, and you
-can manually change it yourself with whatever MUA you are comfortable
-with.
-
I sent a patch and I'm wondering what happened to it - how can I tell whether it got merged?
--------------------------------------------------------------------------------------------
Start by looking at the main patchworks queue for netdev:
--
2.34.1
next prev parent reply other threads:[~2022-03-29 5:09 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 5:08 [PATCH net v2 00/14] docs: update and move the netdev-FAQ Jakub Kicinski
2022-03-29 5:08 ` [PATCH net v2 01/14] docs: netdev: replace references to old archives Jakub Kicinski
2022-03-30 3:30 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 02/14] docs: netdev: minor reword Jakub Kicinski
2022-03-30 3:30 ` Florian Fainelli
2022-03-29 5:08 ` Jakub Kicinski [this message]
2022-03-29 12:52 ` [PATCH net v2 03/14] docs: netdev: move the patch marking section up Andrew Lunn
2022-03-30 3:30 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 04/14] docs: netdev: turn the net-next closed into a Warning Jakub Kicinski
2022-03-30 3:30 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 05/14] docs: netdev: note that RFC postings are allowed any time Jakub Kicinski
2022-03-29 12:53 ` Andrew Lunn
2022-03-30 3:31 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 06/14] docs: netdev: shorten the name and mention msgid for patch status Jakub Kicinski
2022-03-30 3:31 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 07/14] docs: netdev: rephrase the 'Under review' question Jakub Kicinski
2022-03-30 3:33 ` Florian Fainelli
2022-03-30 4:17 ` Jakub Kicinski
2022-03-29 5:08 ` [PATCH net v2 08/14] docs: netdev: rephrase the 'should I update patchwork' question Jakub Kicinski
2022-03-29 5:08 ` [PATCH net v2 09/14] docs: netdev: add a question about re-posting frequency Jakub Kicinski
2022-03-30 3:33 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 10/14] docs: netdev: make the testing requirement more stringent Jakub Kicinski
2022-03-30 3:34 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 11/14] docs: netdev: add missing back ticks Jakub Kicinski
2022-03-30 3:34 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 12/14] docs: netdev: call out the merge window in tag checking Jakub Kicinski
2022-03-30 3:34 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 13/14] docs: netdev: broaden the new vs old code formatting guidelines Jakub Kicinski
2022-03-30 3:34 ` Florian Fainelli
2022-03-29 5:08 ` [PATCH net v2 14/14] docs: netdev: move the netdev-FAQ to the process pages Jakub Kicinski
2022-03-30 3:35 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220329050830.2755213-4-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=andrew@lunn.ch \
--cc=bpf@vger.kernel.org \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).