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

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:
 "This is everything else from -mm for this merge window.

  90 patches.

  Subsystems affected by this patch series: mm (cleanups and slub),
  alpha, procfs, sysctl, misc, core-kernel, bitmap, lib, compat,
  checkpatch, epoll, isofs, nilfs2, hpfs, exit, fork, kexec, gcov,
  panic, delayacct, gdb, resource, selftests, async, initramfs, ipc,
  drivers/char, and spelling"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (90 commits)
  mm: fix typos in comments
  mm: fix typos in comments
  treewide: remove editor modelines and cruft
  ipc/sem.c: spelling fix
  fs: fat: fix spelling typo of values
  kernel/sys.c: fix typo
  kernel/up.c: fix typo
  kernel/user_namespace.c: fix typos
  kernel/umh.c: fix some spelling mistakes
  include/linux/pgtable.h: few spelling fixes
  mm/slab.c: fix spelling mistake "disired" -> "desired"
  scripts/spelling.txt: add "overflw"
  scripts/spelling.txt: Add "diabled" typo
  scripts/spelling.txt: add "overlfow"
  arm: print alloc free paths for address in registers
  mm/vmalloc: remove vwrite()
  mm: remove xlate_dev_kmem_ptr()
  drivers/char: remove /dev/kmem for good
  mm: fix some typos and code style problems
  ipc/sem.c: mundane typo fixes
  ...
parents 05da1f64 baf2f90b

Documentation/admin-guide/devices.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


   1 char	Memory devices

		  1 = /dev/mem		Physical memory access

		  2 = /dev/kmem		Kernel virtual memory access

		  2 = /dev/kmem		OBSOLETE - replaced by /proc/kcore

		  3 = /dev/null		Null device

		  4 = /dev/port		I/O port access

		  5 = /dev/zero		Null byte source

Documentation/admin-guide/kernel-parameters.txt

+12 −0
Original line number Diff line number Diff line
@@ -1835,6 +1835,18 @@ 
			initcall functions.  Useful for debugging built-in

			modules and initcalls.



	initramfs_async= [KNL]

			Format: <bool>

			Default: 1

			This parameter controls whether the initramfs

			image is unpacked asynchronously, concurrently

			with devices being probed and

			initialized. This should normally just work,

			but as a debugging aid, one can get the

			historical behaviour of the initramfs

			unpacking being completed before device_ and

			late_ initcalls.



	initrd=		[BOOT] Specify the location of the initial ramdisk



	initrdmem=	[KNL] Specify a physical address and size from which to

Documentation/dev-tools/gdb-kernel-debugging.rst

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ Examples of using the Linux-provided gdb helpers 
    [     0.000000] BIOS-e820: [mem 0x000000000009fc00-0x000000000009ffff] reserved

    ....



- Examine fields of the current task struct::

- Examine fields of the current task struct(supported by x86 and arm64 only)::



    (gdb) p $lx_current().pid

    $1 = 4998

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -3207,6 +3207,22 @@ F: Documentation/filesystems/bfs.rst 
F:	fs/bfs/

F:	include/uapi/linux/bfs_fs.h









BITMAP API









M:	Yury Norov <yury.norov@gmail.com>









R:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>









R:	Rasmus Villemoes <linux@rasmusvillemoes.dk>









S:	Maintained









F:	include/asm-generic/bitops/find.h









F:	include/linux/bitmap.h









F:	lib/bitmap.c









F:	lib/find_bit.c









F:	lib/find_bit_benchmark.c









F:	lib/test_bitmap.c









F:	tools/include/asm-generic/bitops/find.h









F:	tools/include/linux/bitmap.h









F:	tools/lib/bitmap.c









F:	tools/lib/find_bit.c

















BLINKM RGB LED DRIVER









M:	Jan-Simon Moeller <jansimon.moeller@gmx.de>









S:	Maintained
































arch/alpha/include/asm/io.h



+0
−5






























Original line number
Diff line number
Diff line







@@ -602,11 +602,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);







 */









#define xlate_dev_mem_ptr(p)	__va(p)



















/*









 * Convert a virtual cached pointer to an uncached pointer









 */









#define xlate_dev_kmem_ptr(p)	p



















#endif /* __KERNEL__ */



















#endif /* __ALPHA_IO_H */