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

Author: c-po

docs/configuration/system/option.rst

@@ -43,17 +43,13 @@ Kernel
 
 .. 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:
 
     * ``intel_idle.max_cstate=0`` Disable intel_idle and fall back on acpi_idle
     * ``processor.max_cstate=1`` Limit processor to maximum C-state 1
 
     .. note:: Setting will only become active with the next reboot!
 
-<<<<<<< HEAD
-=======
 .. cfgcmd:: set system option kernel amd-pstate-driver <mode>
 
     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
     embedded serial console interfaces to speed up the boot process.
 
->>>>>>> fd6b53a (T7397: add "system kernel option quiet" to suppress boot messages)
 ***********
 HTTP client
 ***********