Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'akpm' (updates from Andrew Morton) 

Merge second patch-bomb from Andrew Morton:
 - misc fixes
 - audit stuff
 - fanotify/inotify/dnotify things
 - most of the rest of MM.  The new cache shrinker code from Glauber and
   Dave Chinner probably isn't quite stabilized yet.
 - ptrace
 - ipc
 - partitions
 - reboot cleanups
 - add LZ4 decompressor, use it for kernel compression

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  lib/scatterlist: error handling in __sg_alloc_table()
  scsi_debug: fix do_device_access() with wrap around range
  crypto: talitos: use sg_pcopy_to_buffer()
  lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
  lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next()
  crypto: add lz4 Cryptographic API
  lib: add lz4 compressor module
  arm: add support for LZ4-compressed kernel
  lib: add support for LZ4-compressed kernel
  decompressor: add LZ4 decompressor module
  lib: add weak clz/ctz functions
  reboot: move arch/x86 reboot= handling to generic kernel
  reboot: arm: change reboot_mode to use enum reboot_mode
  reboot: arm: prepare reboot_mode for moving to generic kernel code
  reboot: arm: remove unused restart_mode fields from some arm subarchs
  reboot: unicore32: prepare reboot_mode for moving to generic kernel code
  reboot: x86: prepare reboot_mode for moving to generic kernel code
  reboot: checkpatch.pl the new kernel/reboot.c file
  reboot: move shutdown/reboot related functions to kernel/reboot.c
  reboot: remove -stable friendly PF_THREAD_BOUND define
  ...
parents 899dd388 27daabd9

Documentation/kernel-parameters.txt

+11 −3
Original line number Diff line number Diff line
@@ -2681,9 +2681,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Run specified binary instead of /init from the ramdisk,

			used for early userspace startup. See initrd.



	reboot=		[BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode

			Format: <reboot_mode>[,<reboot_mode2>[,...]]

			See arch/*/kernel/reboot.c or arch/*/kernel/process.c

	reboot=		[KNL]

			Format (x86 or x86_64):

				[w[arm] | c[old] | h[ard] | s[oft] | g[pio]] \

				[[,]s[mp]#### \

				[[,]b[ios] | a[cpi] | k[bd] | t[riple] | e[fi] | p[ci]] \

				[[,]f[orce]

			Where reboot_mode is one of warm (soft) or cold (hard) or gpio,

			      reboot_type is one of bios, acpi, kbd, triple, efi, or pci,

			      reboot_force is either force or not specified,

			      reboot_cpu is s[mp]#### with #### being the processor

					to be used for rebooting.



	relax_domain_level=

			[KNL, SMP] Set scheduler's default relax_domain_level.

Documentation/sysctl/vm.txt

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ Specify "[Dd]efault" to request automatic configuration. Autoconfiguration 
will select "node" order in following case.

(1) if the DMA zone does not exist or

(2) if the DMA zone comprises greater than 50% of the available memory or

(3) if any node's DMA zone comprises greater than 60% of its local memory and

(3) if any node's DMA zone comprises greater than 70% of its local memory and

    the amount of local memory is big enough.



Otherwise, "zone" order will be selected. Default order is recommended unless

Documentation/vm/transhuge.txt

+2 −2
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ By default kernel tries to use huge zero page on read page fault. 
It's possible to disable huge zero page by writing 0 or enable it

back by writing 1:



echo 0 >/sys/kernel/mm/transparent_hugepage/khugepaged/use_zero_page

echo 1 >/sys/kernel/mm/transparent_hugepage/khugepaged/use_zero_page

echo 0 >/sys/kernel/mm/transparent_hugepage/use_zero_page

echo 1 >/sys/kernel/mm/transparent_hugepage/use_zero_page



khugepaged will be automatically started when

transparent_hugepage/enabled is set to "always" or "madvise, and it'll

Documentation/x86/boot.txt

+4 −3
Original line number Diff line number Diff line
@@ -657,8 +657,9 @@ Protocol: 2.08+ 
  uncompressed data should be determined using the standard magic

  numbers.  The currently supported compression formats are gzip

  (magic numbers 1F 8B or 1F 9E), bzip2 (magic number 42 5A), LZMA

  (magic number 5D 00), and XZ (magic number FD 37).  The uncompressed

  payload is currently always ELF (magic number 7F 45 4C 46).

  (magic number 5D 00), XZ (magic number FD 37), and LZ4 (magic number

  02 21).  The uncompressed payload is currently always ELF (magic

  number 7F 45 4C 46).



Field name:	payload_length

Type:		read

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -9268,6 +9268,13 @@ F: Documentation/networking/z8530drv.txt 
F:	drivers/net/hamradio/*scc.c

F:	drivers/net/hamradio/z8530.h



ZBUD COMPRESSED PAGE ALLOCATOR

M:	Seth Jennings <sjenning@linux.vnet.ibm.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zbud.c

F:	include/linux/zbud.h



ZD1211RW WIRELESS DRIVER

M:	Daniel Drake <dsd@gentoo.org>

M:	Ulrich Kunitz <kune@deine-taler.de>
@@ -9290,6 +9297,12 @@ M: "Maciej W. Rozycki" <macro@linux-mips.org> 
S:	Maintained

F:	drivers/tty/serial/zs.*



ZSWAP COMPRESSED SWAP CACHING

M:	Seth Jennings <sjenning@linux.vnet.ibm.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zswap.c



THE REST

M:	Linus Torvalds <torvalds@linux-foundation.org>

L:	linux-kernel@vger.kernel.org