diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-20 00:46:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-20 00:46:17 +0300 |
| commit | cd557bc0a2d0f36c41b6040c27f31da5c5b76f49 (patch) | |
| tree | 1d754d9679797332d5d8c9547fcc27c326cdb8b3 /Documentation | |
| parent | b0014556a2a1991df08b2b5d586a1bcc9e762ffd (diff) | |
| parent | ec9aedb2aa1ab7ac420c00b31f5edc5be15ec167 (diff) | |
| download | linux-cd557bc0a2d0f36c41b6040c27f31da5c5b76f49.tar.xz | |
Merge tag 'x86_urgent_for_v6.7_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
- Ignore invalid x2APIC entries in order to not waste per-CPU data
- Fix a back-to-back signals handling scenario when shadow stack is in
use
- A documentation fix
- Add Kirill as TDX maintainer
* tag 'x86_urgent_for_v6.7_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/acpi: Ignore invalid x2APIC entries
x86/shstk: Delay signal entry SSP write until after user accesses
x86/Documentation: Indent 'note::' directive for protocol version number note
MAINTAINERS: Add Intel TDX entry
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arch/x86/boot.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arch/x86/boot.rst b/Documentation/arch/x86/boot.rst index f5d2f2414de8..22cc7a040dae 100644 --- a/Documentation/arch/x86/boot.rst +++ b/Documentation/arch/x86/boot.rst @@ -77,7 +77,7 @@ Protocol 2.14 BURNT BY INCORRECT COMMIT Protocol 2.15 (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max. ============= ============================================================ -.. note:: + .. note:: The protocol version number should be changed only if the setup header is changed. There is no need to update the version number if boot_params or kernel_info are changed. Additionally, it is recommended to use |