Re: linux-next: build warning after merge of the mm tree

[Andrew Morton]

On Thu, 6 Jun 2024 13:01:50 +0800 Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> wrote:

> 
> 
> On 2024/6/6 11:23, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the mm tree, today's linux-next build (htmldocs) produced
> > this warning:
> > 
> > Documentation/admin-guide/mm/transhuge.rst:342: ERROR: Unexpected indentation.
> > 
> > Introduced by commit
> > 
> >    716119bee914 ("mm: shmem: add multi-size THP sysfs interface for anonymous shmem")
> > 
> > from the mm-unstable branch of the mm tree.
> > 
> 
> Thanks for reporting.
> 
> Andrew, could you help to fold below changes into this serires, which 
> can fix the htmldocs building error? Thanks.
> 
> ...
>
> --- a/Documentation/admin-guide/mm/transhuge.rst
> +++ b/Documentation/admin-guide/mm/transhuge.rst
> @@ -338,6 +338,7 @@ and its value for each mTHP is essentially 
> consistent with the global setting.
>   An 'inherit' option is added to ensure compatibility with these global 
> settings.
>   Conversely, the options 'force' and 'deny' are dropped, which are 
> rather testing
>   artifacts from the old ages.
> +
>   always
>       Attempt to allocate <size> huge pages every time we need a new page;

That's rather whitespace mangled, but I fixed it.  I also added

From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-shmem-add-multi-size-thp-sysfs-interface-for-anonymous-shmem-fix-fix
Date: Tue Jun 11 02:56:34 PM PDT 2024

reflow transhuge.rst addition to 80 cols

Cc: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 Documentation/admin-guide/mm/transhuge.rst |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- a/Documentation/admin-guide/mm/transhuge.rst~mm-shmem-add-multi-size-thp-sysfs-interface-for-anonymous-shmem-fix-fix
+++ a/Documentation/admin-guide/mm/transhuge.rst
@@ -332,12 +332,13 @@ deny
 force
     Force the huge option on for all - very useful for testing;
 
-Shmem can also use "multi-size THP" (mTHP) by adding a new sysfs knob to control
-mTHP allocation: '/sys/kernel/mm/transparent_hugepage/hugepages-<size>kB/shmem_enabled',
-and its value for each mTHP is essentially consistent with the global setting.
-An 'inherit' option is added to ensure compatibility with these global settings.
-Conversely, the options 'force' and 'deny' are dropped, which are rather testing
-artifacts from the old ages.
+Shmem can also use "multi-size THP" (mTHP) by adding a new sysfs knob to
+control mTHP allocation:
+'/sys/kernel/mm/transparent_hugepage/hugepages-<size>kB/shmem_enabled',
+and its value for each mTHP is essentially consistent with the global
+setting.  An 'inherit' option is added to ensure compatibility with these
+global settings.  Conversely, the options 'force' and 'deny' are dropped,
+which are rather testing artifacts from the old ages.
 
 always
     Attempt to allocate <size> huge pages every time we need a new page;
_