Skip to content

Commit e0326eb

Browse files
authored
Merge pull request #782 from ojeda/sync-with-v7
Sync with v7
2 parents 26f28c3 + 1383572 commit e0326eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+111
-2496
lines changed

Documentation/COPYING-logo

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,3 @@ Larry's web-page:
1111

1212
https://www.isc.tamu.edu/~lewing/linux/
1313

14-
The SVG version was re-illustrated in vector by Garrett LeSage and
15-
refined and cleaned up by IFo Hancroft. It is also freely usable
16-
as long as you acknowledge Larry, Garrett and IFo Hancroft as above.
17-
18-
There are also black-and-white and inverted vector versions at
19-
Garrett's repository:
20-
21-
https://github.com/garrett/Tux

Documentation/core-api/printk-formats.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,16 @@ Examples::
625625
%p4cc Y10 little-endian (0x20303159)
626626
%p4cc NV12 big-endian (0xb231564e)
627627

628+
Rust
629+
----
630+
631+
::
632+
633+
%pA
634+
635+
Only intended to be used from Rust code to format ``core::fmt::Arguments``.
636+
Do *not* use it from C.
637+
628638
Thanks
629639
======
630640

Documentation/doc-guide/kernel-doc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ when it is embedded in source files.
1212
comments. Please stick to the style described here.
1313

1414
.. note:: kernel-doc does not cover Rust code: please see
15-
Documentation/rust/docs.rst instead.
15+
Documentation/rust/general-information.rst instead.
1616

1717
The kernel-doc structure is extracted from the comments, and proper
1818
`Sphinx C Domain`_ function and type descriptions with anchors are

0 commit comments

Comments
 (0)