Merge branch 'sagitta' into mergify/bp/sagitta/pr-1632

This commit is contained in:
Christian Breunig 2025-05-05 19:48:23 +02:00 committed by GitHub
commit d9ca18fc33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -43,8 +43,6 @@ Kernel
.. cfgcmd:: set system option kernel disable-power-saving .. cfgcmd:: set system option kernel disable-power-saving
Disable CPU power saving mechanisms also known as C states.
This will add the following two options to the Kernel commandline: This will add the following two options to the Kernel commandline:
* ``intel_idle.max_cstate=0`` Disable intel_idle and fall back on acpi_idle * ``intel_idle.max_cstate=0`` Disable intel_idle and fall back on acpi_idle
@ -52,8 +50,6 @@ Kernel
.. note:: Setting will only become active with the next reboot! .. note:: Setting will only become active with the next reboot!
<<<<<<< HEAD
=======
.. cfgcmd:: set system option kernel amd-pstate-driver <mode> .. cfgcmd:: set system option kernel amd-pstate-driver <mode>
Enables and configures p-state driver for modern AMD Ryzen and Epyc CPUs. Enables and configures p-state driver for modern AMD Ryzen and Epyc CPUs.
@ -81,7 +77,6 @@ Kernel
Suppress most kernel messages during boot. This is useful for systems with Suppress most kernel messages during boot. This is useful for systems with
embedded serial console interfaces to speed up the boot process. embedded serial console interfaces to speed up the boot process.
>>>>>>> fd6b53a (T7397: add "system kernel option quiet" to suppress boot messages)
*********** ***********
HTTP client HTTP client
*********** ***********