diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 19:59:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 19:59:33 +0300 |
| commit | 8cc1e20765f03a29442484a9acbc97e31578af92 (patch) | |
| tree | b8b9f5d14a52a72ca42c87bb9da38b4f33592e27 /Documentation/admin-guide | |
| parent | f0d43b3a3809f280806825df2454fd83f71874c4 (diff) | |
| parent | 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 (diff) | |
| download | linux-8cc1e20765f03a29442484a9acbc97e31578af92.tar.xz | |
Merge tag 'm68k-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- enable memtest functionality
- defconfig updates
* tag 'm68k-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v5.16-rc1
m68k: Enable memtest functionality
Diffstat (limited to 'Documentation/admin-guide')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2fba82431efb..35e3fd46a51e 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2940,7 +2940,7 @@ both parameters are enabled, hugetlb_free_vmemmap takes precedence over memory_hotplug.memmap_on_memory. - memtest= [KNL,X86,ARM,PPC,RISCV] Enable memtest + memtest= [KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest Format: <integer> default : 0 <disable> Specifies the number of memtest passes to be |