Skip to content

Commit a10ca09

Browse files
committed
Merge tag 'driver-core-6.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH: "Here are three small changes for 6.3-rc5 semi-related to driver core stuff: - documentation update where we move the security_bugs file to a more relevant location. - mdt/spi-nor debugfs memory leak fix that's been floating around for a long time and acked by the maintainer - cacheinfo bugfix for a regression in 6.3-rc1 All have been in linux-next with no reported problems" * tag 'driver-core-6.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: cacheinfo: Fix LLC is not exported through sysfs Documentation/security-bugs: move from admin-guide/ to process/ mtd: spi-nor: fix memory leak when using debugfs_lookup()
2 parents 95d0b9d + 5c27123 commit a10ca09

File tree

23 files changed

+60
-29
lines changed

23 files changed

+60
-29
lines changed

Documentation/admin-guide/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ problems and bugs in particular.
3636

3737
reporting-issues
3838
reporting-regressions
39-
security-bugs
4039
bug-hunting
4140
bug-bisect
4241
tainted-kernels

Documentation/admin-guide/reporting-issues.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the
395395
list of tracked regressions, to ensure it won't fall through the cracks.
396396

397397
What qualifies as security issue is left to your judgment. Consider reading
398-
Documentation/admin-guide/security-bugs.rst before proceeding, as it
398+
Documentation/process/security-bugs.rst before proceeding, as it
399399
provides additional details how to best handle security issues.
400400

401401
An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward
12691269
the report's text to these addresses; but on top of it put a small note where
12701270
you mention that you filed it with a link to the ticket.
12711271

1272-
See Documentation/admin-guide/security-bugs.rst for more information.
1272+
See Documentation/process/security-bugs.rst for more information.
12731273

12741274

12751275
Duties after the report went out

Documentation/process/howto.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ required reading:
138138
philosophy and is very important for people moving to Linux from
139139
development on other Operating Systems.
140140

141-
:ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`
141+
:ref:`Documentation/process/security-bugs.rst <securitybugs>`
142142
If you feel you have found a security problem in the Linux kernel,
143143
please follow the steps in this document to help notify the kernel
144144
developers, and help solve the issue.

Documentation/process/index.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ Below are the essential guides that every developer should read.
3535
kernel-enforcement-statement
3636
kernel-driver-statement
3737

38+
For security issues, see:
39+
40+
.. toctree::
41+
:maxdepth: 1
42+
43+
security-bugs
44+
embargoed-hardware-issues
45+
3846
Other guides to the community that are of interest to most developers are:
3947

4048
.. toctree::
@@ -47,7 +55,6 @@ Other guides to the community that are of interest to most developers are:
4755
submit-checklist
4856
kernel-docs
4957
deprecated
50-
embargoed-hardware-issues
5158
maintainers
5259
researcher-guidelines
5360

Documentation/process/researcher-guidelines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Before contributing, carefully read the appropriate documentation:
6868
* Documentation/process/development-process.rst
6969
* Documentation/process/submitting-patches.rst
7070
* Documentation/admin-guide/reporting-issues.rst
71-
* Documentation/admin-guide/security-bugs.rst
71+
* Documentation/process/security-bugs.rst
7272

7373
Then send a patch (including a commit log with all the details listed
7474
below) and follow up on any feedback from other developers.

Documentation/process/stable-kernel-rules.rst

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

4040
Security patches should not be handled (solely) by the -stable review
4141
process but should follow the procedures in
42-
:ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.
42+
:ref:`Documentation/process/security-bugs.rst <securitybugs>`.
4343

4444
For all other submissions, choose one of the following procedures
4545
-----------------------------------------------------------------

Documentation/process/submitting-patches.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ If you have a patch that fixes an exploitable security bug, send that patch
254254
to security@kernel.org. For severe bugs, a short embargo may be considered
255255
to allow distributors to get the patch out to users; in such cases,
256256
obviously, the patch should not be sent to any public lists. See also
257-
Documentation/admin-guide/security-bugs.rst.
257+
Documentation/process/security-bugs.rst.
258258

259259
Patches that fix a severe bug in a released kernel should be directed
260260
toward the stable maintainers by putting a line like this::

Documentation/translations/it_IT/admin-guide/security-bugs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. include:: ../disclaimer-ita.rst
22

3-
:Original: :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`
3+
:Original: :ref:`Documentation/process/security-bugs.rst <securitybugs>`
44

55
.. _it_securitybugs:
66

Documentation/translations/it_IT/process/submitting-patches.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ embargo potrebbe essere preso in considerazione per dare il tempo alle
272272
distribuzioni di prendere la patch e renderla disponibile ai loro utenti;
273273
in questo caso, ovviamente, la patch non dovrebbe essere inviata su alcuna
274274
lista di discussione pubblica. Leggete anche
275-
Documentation/admin-guide/security-bugs.rst.
275+
Documentation/process/security-bugs.rst.
276276

277277
Patch che correggono bachi importanti su un kernel già rilasciato, dovrebbero
278278
essere inviate ai manutentori dei kernel stabili aggiungendo la seguente riga::

0 commit comments

Comments
 (0)