* tip-bot for Michal Hocko <tipbot@xxxxxxxxx> wrote: > Commit-ID: f4abaa98c4575cc06ea5e1a593e3bc2c8de8ef48 > Gitweb: https://git.kernel.org/tip/f4abaa98c4575cc06ea5e1a593e3bc2c8de8ef48 > Author: Michal Hocko <mhocko@xxxxxxxx> > AuthorDate: Tue, 13 Nov 2018 19:49:10 +0100 > Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > CommitDate: Mon, 10 Dec 2018 22:07:02 +0100 > > x86/speculation/l1tf: Drop the swap storage limit restriction when l1tf=off > [ tglx: Folded the documentation delta change ] > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -2095,6 +2095,9 @@ > off > Disables hypervisor mitigations and doesn't > emit any warnings. > + It also drops the swap size and available > + RAM limit restriction on both hypervisor and > + bare metal. > > Default is 'flush'. > > diff --git a/Documentation/admin-guide/l1tf.rst b/Documentation/admin-guide/l1tf.rst > index b85dd80510b0..2e65e6cb033e 100644 > --- a/Documentation/admin-guide/l1tf.rst > +++ b/Documentation/admin-guide/l1tf.rst > @@ -405,6 +405,9 @@ time with the option "l1tf=". The valid arguments for this option are: > > off Disables hypervisor mitigations and doesn't emit any > warnings. > + It also drops the swap size and available RAM limit restrictions > + on both hypervisor and bare metal. > + Note tha there's also some whitespace damage here: all other similar lines in this RST file start with two tabs, this one starts with 8 spaces. Thanks, Ingo