Commit 245137cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:
 "118 patches:

   - The rest of MM.

     Includes kfence - another runtime memory validator. Not as thorough
     as KASAN, but it has unmeasurable overhead and is intended to be
     usable in production builds.

   - Everything else

  Subsystems affected by this patch series: alpha, procfs, sysctl,
  misc, core-kernel, MAINTAINERS, lib, bitops, checkpatch, init,
  coredump, seq_file, gdb, ubsan, initramfs, and mm (thp, cma,
  vmstat, memory-hotplug, mlock, rmap, zswap, zsmalloc, cleanups,
  kfence, kasan2, and pagemap2)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  MIPS: make userspace mapping young by default
  initramfs: panic with memory information
  ubsan: remove overflow checks
  kgdb: fix to kill breakpoints on initmem after boot
  scripts/gdb: fix list_for_each
  x86: fix seq_file iteration for pat/memtype.c
  seq_file: document how per-entry resources are managed.
  fs/coredump: use kmap_local_page()
  init/Kconfig: fix a typo in CC_VERSION_TEXT help text
  init: clean up early_param_on_off() macro
  init/version.c: remove Version_<LINUX_VERSION_CODE> symbol
  checkpatch: do not apply "initialise globals to 0" check to BPF progs
  checkpatch: don't warn about colon termination in linker scripts
  checkpatch: add kmalloc_array_node to unnecessary OOM message check
  checkpatch: add warning for avoiding .L prefix symbols in assembly files
  checkpatch: improve TYPECAST_INT_CONSTANT test message
  checkpatch: prefer ftrace over function entry/exit printks
  checkpatch: trivial style fixes
  checkpatch: ignore warning designated initializers using NR_CPUS
  checkpatch: improve blank line after declaration test
  ...
parents 1c9077cd f685a533

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

CREDITS

+3 −6
Original line number Diff line number Diff line
@@ -2841,14 +2841,11 @@ S: Subiaco, 6008 
S: Perth, Western Australia

S: Australia



N: Miguel Ojeda Sandonis

E: miguel.ojeda.sandonis@gmail.com

W: http://miguelojeda.es

W: http://jair.lab.fi.uva.es/~migojed/

N: Miguel Ojeda

E: ojeda@kernel.org

W: https://ojeda.dev

D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.

D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)

S: C/ Mieses 20, 9-B

S: Valladolid 47009

S: Spain



N: Peter Oruba

Documentation/ABI/testing/sysfs-devices-memory

+36 −22
Original line number Diff line number Diff line
@@ -13,21 +13,22 @@ What: /sys/devices/system/memory/memoryX/removable 
Date:		June 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/removable

		indicates whether this memory block is removable or not.

		This is useful for a user-level agent to determine

		identify removable sections of the memory before attempting

		potentially expensive hot-remove memory operation

		The file /sys/devices/system/memory/memoryX/removable is a

		legacy interface used to indicated whether a memory block is

		likely to be offlineable or not.  Newer kernel versions return

		"1" if and only if the kernel supports memory offlining.

Users:		hotplug memory remove tools

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils

		lsmem/chmem part of util-linux



What:		/sys/devices/system/memory/memoryX/phys_device

Date:		September 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/phys_device

		is read-only and is designed to show the name of physical

		memory device.  Implementation is currently incomplete.

		is read-only;  it is a legacy interface only ever used on s390x

		to expose the covered storage increment.

Users:		Legacy s390-tools lsmem/chmem



What:		/sys/devices/system/memory/memoryX/phys_index

Date:		September 2008
@@ -43,23 +44,25 @@ Date: September 2008 
Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/state

		is read-write.  When read, its contents show the

		online/offline state of the memory section.  When written,

		root can toggle the the online/offline state of a removable

		memory section (see removable file description above)

		using the following commands::

		is read-write.  When read, it returns the online/offline

		state of the memory block.  When written, root can toggle

		the online/offline state of a memory block using the following

		commands::



		  # echo online > /sys/devices/system/memory/memoryX/state

		  # echo offline > /sys/devices/system/memory/memoryX/state



		For example, if /sys/devices/system/memory/memory22/removable

		contains a value of 1 and

		/sys/devices/system/memory/memory22/state contains the

		string "online" the following command can be executed by

		by root to offline that section::



		  # echo offline > /sys/devices/system/memory/memory22/state



		On newer kernel versions, advanced states can be specified

		when onlining to select a target zone: "online_movable"

		selects the movable zone.  "online_kernel" selects the

		applicable kernel zone (DMA, DMA32, or Normal).  However,

		after successfully setting one of the advanced states,

		reading the file will return "online"; the zone information

		can be obtained via "valid_zones" instead.



		While onlining is unlikely to fail, there are no guarantees

		that offlining will succeed.  Offlining is more likely to

		succeed if "valid_zones" indicates "Movable".

Users:		hotplug memory remove tools

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
@@ -69,8 +72,19 @@ Date: July 2014 
Contact:	Zhang Zhen <zhenzhang.zhang@huawei.com>

Description:

		The file /sys/devices/system/memory/memoryX/valid_zones	is

		read-only and is designed to show which zone this memory

		block can be onlined to.

		read-only.



		For online memory blocks, it returns in which zone memory

		provided by a memory block is managed.  If multiple zones

		apply (not applicable for hotplugged memory), "None" is returned

		and the memory block cannot be offlined.



		For offline memory blocks, it returns by which zone memory

		provided by a memory block can be managed when onlining.

		The first returned zone ("default") will be used when setting

		the state of an offline memory block to "online".  Only one of

		the kernel zones (DMA, DMA32, Normal) is applicable for a single

		memory block.



What:		/sys/devices/system/memoryX/nodeY

Date:		October 2009

Documentation/admin-guide/auxdisplay/cfag12864b.rst

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ cfag12864b LCD Driver Documentation 
===================================



:License:		GPLv2

:Author & Maintainer:	Miguel Ojeda Sandonis

:Author & Maintainer:	Miguel Ojeda <ojeda@kernel.org>

:Date:			2006-10-27

Documentation/admin-guide/auxdisplay/ks0108.rst

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ ks0108 LCD Controller Driver Documentation 
==========================================



:License:		GPLv2

:Author & Maintainer:	Miguel Ojeda Sandonis

:Author & Maintainer:	Miguel Ojeda <ojeda@kernel.org>

:Date:			2006-10-27