Commit f986e350 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:

 - lots of little subsystems

 - a few post-linux-next MM material. Most of the rest awaits more
   merging of other trees.

Subsystems affected by this series: alpha, procfs, misc, core-kernel,
bitmap, lib, lz4, checkpatch, nilfs, kdump, rapidio, gcov, bfs, relay,
resource, ubsan, reboot, fault-injection, lzo, apparmor, and mm (swap,
memory-hotplug, pagemap, cleanups, and gup).

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (86 commits)
  mm: fix some spelling mistakes in comments
  mm: simplify follow_pte{,pmd}
  mm: unexport follow_pte_pmd
  apparmor: remove duplicate macro list_entry_is_head()
  lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static
  fault-injection: handle EI_ETYPE_TRUE
  reboot: hide from sysfs not applicable settings
  reboot: allow to override reboot type if quirks are found
  reboot: remove cf9_safe from allowed types and rename cf9_force
  reboot: allow to specify reboot mode via sysfs
  reboot: refactor and comment the cpu selection code
  lib/ubsan.c: mark type_check_kinds with static keyword
  kcov: don't instrument with UBSAN
  ubsan: expand tests and reporting
  ubsan: remove UBSAN_MISC in favor of individual options
  ubsan: enable for all*config builds
  ubsan: disable UBSAN_TRAP for all*config
  ubsan: disable object-size sanitizer under GCC
  ubsan: move cc-option tests into Kconfig
  ubsan: remove redundant -Wno-maybe-uninitialized
  ...
parents d01e7f10 8958b249

Documentation/ABI/testing/sysfs-kernel-reboot

0 → 100644
+32 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/reboot

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Description:	Interface to set the kernel reboot behavior, similarly to

		what can be done via the reboot= cmdline option.

		(see Documentation/admin-guide/kernel-parameters.txt)



What:		/sys/kernel/reboot/mode

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Description:	Reboot mode. Valid values are: cold warm hard soft gpio



What:		/sys/kernel/reboot/type

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Description:	Reboot type. Valid values are: bios acpi kbd triple efi pci



What:		/sys/kernel/reboot/cpu

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Description:	CPU number to use to reboot.



What:		/sys/kernel/reboot/force

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Description:	Don't wait for any other CPUs on reboot and

		avoid anything that could hang.

Documentation/admin-guide/kdump/vmcoreinfo.rst

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ call. 
User-space tools can get the kernel name, host name, kernel release

number, kernel version, architecture name and OS type from it.



(uts_namespace, name)

---------------------



Offset of the name's member. Crash Utility and Makedumpfile get

the start address of the init_uts_ns.name from this.



node_online_map

---------------

Documentation/dev-tools/ubsan.rst

+1 −0
Original line number Diff line number Diff line
@@ -86,3 +86,4 @@ References 


.. _1: https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Debugging-Options.html

.. _2: https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html

.. _3: https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html

Documentation/filesystems/proc.rst

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ read the file /proc/PID/status:: 
  NoNewPrivs:     0

  Seccomp:        0

  Speculation_Store_Bypass:       thread vulnerable

  SpeculationIndirectBranch:      conditional enabled

  voluntary_ctxt_switches:        0

  nonvoluntary_ctxt_switches:     1
@@ -292,6 +293,7 @@ It's slow but very precise. 
 NoNewPrivs                  no_new_privs, like prctl(PR_GET_NO_NEW_PRIV, ...)

 Seccomp                     seccomp mode, like prctl(PR_GET_SECCOMP, ...)

 Speculation_Store_Bypass    speculative store bypass mitigation status

 SpeculationIndirectBranch   indirect branch speculation mode

 Cpus_allowed                mask of CPUs on which this process may run

 Cpus_allowed_list           Same as previous, but in "list format"

 Mems_allowed                mask of memory nodes allowed to this process

arch/alpha/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ common_shutdown_1(void *generic_ptr) 
#ifdef CONFIG_DUMMY_CONSOLE

		/* If we've gotten here after SysRq-b, leave interrupt

		   context before taking over the console. */

		if (in_interrupt())

		if (in_irq())

			irq_exit();

		/* This has the effect of resetting the VGA video origin.  */

		console_lock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE