Skip to content

Commit 287f4fa

Browse files
tchardingdavem330
authored andcommitted
docs: Update references to netdev-FAQ
File 'Documentation/networking/netdev-FAQ.txt' has been converted to RST format. We should update all links/references to point to the new file. Update references to netdev-FAQ Signed-off-by: Tobin C. Harding <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 96398dd commit 287f4fa

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

Documentation/bpf/bpf_devel_QA.rst

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ into the bpf-next tree will make their way into net-next tree. net and
106106
net-next are both run by David S. Miller. From there, they will go
107107
into the kernel mainline tree run by Linus Torvalds. To read up on the
108108
process of net and net-next being merged into the mainline tree, see
109-
the `netdev FAQ`_ under:
109+
the :ref:`netdev-FAQ`
110+
110111

111-
`Documentation/networking/netdev-FAQ.txt`_
112112

113113
Occasionally, to prevent merge conflicts, we might send pull requests
114114
to other trees (e.g. tracing) with a small subset of the patches, but
@@ -125,8 +125,8 @@ request)::
125125
Q: How do I indicate which tree (bpf vs. bpf-next) my patch should be applied to?
126126
---------------------------------------------------------------------------------
127127

128-
A: The process is the very same as described in the `netdev FAQ`_, so
129-
please read up on it. The subject line must indicate whether the
128+
A: The process is the very same as described in the :ref:`netdev-FAQ`,
129+
so please read up on it. The subject line must indicate whether the
130130
patch is a fix or rather "next-like" content in order to let the
131131
maintainers know whether it is targeted at bpf or bpf-next.
132132

@@ -184,7 +184,7 @@ ii) run extensive BPF test suite and
184184
Once the BPF pull request was accepted by David S. Miller, then
185185
the patches end up in net or net-next tree, respectively, and
186186
make their way from there further into mainline. Again, see the
187-
`netdev FAQ`_ for additional information e.g. on how often they are
187+
:ref:`netdev-FAQ` for additional information e.g. on how often they are
188188
merged to mainline.
189189

190190
Q: How long do I need to wait for feedback on my BPF patches?
@@ -208,7 +208,7 @@ Q: Are patches applied to bpf-next when the merge window is open?
208208
-----------------------------------------------------------------
209209
A: For the time when the merge window is open, bpf-next will not be
210210
processed. This is roughly analogous to net-next patch processing,
211-
so feel free to read up on the `netdev FAQ`_ about further details.
211+
so feel free to read up on the :ref:`netdev-FAQ` about further details.
212212

213213
During those two weeks of merge window, we might ask you to resend
214214
your patch series once bpf-next is open again. Once Linus released
@@ -372,7 +372,7 @@ netdev kernel mailing list in Cc and ask for the fix to be queued up:
372372
373373

374374
The process in general is the same as on netdev itself, see also the
375-
`netdev FAQ`_ document.
375+
:ref:`netdev-FAQ`.
376376

377377
Q: Do you also backport to kernels not currently maintained as stable?
378378
----------------------------------------------------------------------
@@ -388,9 +388,7 @@ Q: The BPF patch I am about to submit needs to go to stable as well
388388
What should I do?
389389

390390
A: The same rules apply as with netdev patch submissions in general, see
391-
`netdev FAQ`_ under:
392-
393-
`Documentation/networking/netdev-FAQ.txt`_
391+
the :ref:`netdev-FAQ`.
394392

395393
Never add "``Cc: [email protected]``" to the patch description, but
396394
ask the BPF maintainers to queue the patches instead. This can be done
@@ -630,8 +628,7 @@ when:
630628
.. Links
631629
.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
632630
.. _MAINTAINERS: ../../MAINTAINERS
633-
.. _Documentation/networking/netdev-FAQ.txt: ../networking/netdev-FAQ.txt
634-
.. _netdev FAQ: ../networking/netdev-FAQ.txt
631+
.. _netdev-FAQ: ../networking/netdev-FAQ.rst
635632
.. _samples/bpf/: ../../samples/bpf/
636633
.. _selftests: ../../tools/testing/selftests/bpf/
637634
.. _Documentation/dev-tools/kselftest.rst:

Documentation/process/stable-kernel-rules.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Procedure for submitting patches to the -stable tree
3737

3838
- If the patch covers files in net/ or drivers/net please follow netdev stable
3939
submission guidelines as described in
40-
Documentation/networking/netdev-FAQ.txt
40+
:ref:`Documentation/networking/netdev-FAQ.rst <netdev-FAQ>`
4141
- Security patches should not be handled (solely) by the -stable review
4242
process but should follow the procedures in
4343
:ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.

0 commit comments

Comments
 (0)