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

Merge branch 'akpm' (patches from Andrew) 

Merge updates from Andrew Morton:

 - various misc bits

 - most of MM (quite a lot of MM material is awaiting the merge of
   linux-next dependencies)

 - kasan

 - printk updates

 - procfs updates

 - MAINTAINERS

 - /lib updates

 - checkpatch updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (123 commits)
  init: reduce rootwait polling interval time to 5ms
  binfmt_elf: use vmalloc() for allocation of vma_filesz
  checkpatch: don't emit unified-diff error for rename-only patches
  checkpatch: don't check c99 types like uint8_t under tools
  checkpatch: avoid multiple line dereferences
  checkpatch: don't check .pl files, improve absolute path commit log test
  scripts/checkpatch.pl: fix spelling
  checkpatch: don't try to get maintained status when --no-tree is given
  lib/ida: document locking requirements a bit better
  lib/rbtree.c: fix typo in comment of ____rb_erase_color
  lib/Kconfig.debug: make CONFIG_STRICT_DEVMEM depend on CONFIG_DEVMEM
  MAINTAINERS: add drm and drm/i915 irc channels
  MAINTAINERS: add "C:" for URI for chat where developers hang out
  MAINTAINERS: add drm and drm/i915 bug filing info
  MAINTAINERS: add "B:" for URI where to file bugs
  get_maintainer: look for arbitrary letter prefixes in sections
  printk: add Kconfig option to set default console loglevel
  printk/sound: handle more message headers
  printk/btrfs: handle more message headers
  printk/kdb: handle more message headers
  ...
parents fe6bce8d 39a0e975

Documentation/devicetree/booting-without-of.txt

+7 −0
Original line number Diff line number Diff line
@@ -974,6 +974,13 @@ compatibility. 
      4Gb. Some vendors prefer splitting those ranges into smaller

      segments, but the kernel doesn't care.



  Additional properties:



    - hotpluggable : The presence of this property provides an explicit

      hint to the operating system that this memory may potentially be

      removed later. The kernel can take this into consideration when

      doing nonmovable allocations and when laying out memory zones.



  e) The /chosen node



  This node is a bit "special". Normally, that's where Open Firmware

Documentation/filesystems/proc.txt

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

  CapEff: 0000000000000000

  CapBnd: ffffffffffffffff

  NoNewPrivs:     0

  Seccomp:        0

  voluntary_ctxt_switches:        0

  nonvoluntary_ctxt_switches:     1
@@ -262,6 +263,7 @@ Table 1-2: Contents of the status files (as of 4.1) 
 CapPrm                      bitmap of permitted capabilities

 CapEff                      bitmap of effective capabilities

 CapBnd                      bitmap of capabilities bounding set

 NoNewPrivs                  no_new_privs, like prctl(PR_GET_NO_NEW_PRIV, ...)

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

 Cpus_allowed                mask of CPUs on which this process may run

 Cpus_allowed_list           Same as previous, but in "list format"

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2397,7 +2397,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			that the amount of memory usable for all allocations

			is not too small.



	movable_node	[KNL,X86] Boot-time switch to enable the effects

	movable_node	[KNL] Boot-time switch to enable the effects

			of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.



	MTD_Partition=	[MTD]

Documentation/vm/transhuge.txt

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ or enable it back by writing 1: 
echo 0 >/sys/kernel/mm/transparent_hugepage/use_zero_page

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



Some userspace (such as a test program, or an optimized memory allocation

library) may want to know the size (in bytes) of a transparent hugepage:



cat /sys/kernel/mm/transparent_hugepage/hpage_pmd_size



khugepaged will be automatically started when

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

be automatically shutdown if it's set to "never".

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ Descriptions of section entries: 
	   These reviewers should be CCed on patches.

	L: Mailing list that is relevant to this area

	W: Web-page with status/info

	B: URI for where to file bugs. A web-page with detailed bug

	   filing info, a direct bug tracker link, or a mailto: URI.

	C: URI for chat protocol, server and channel where developers

	   usually hang out, for example irc://server/channel.

	Q: Patchwork web based patch tracking system site

	T: SCM tree type and location.

	   Type is one of: git, hg, quilt, stgit, topgit
@@ -4024,6 +4028,8 @@ DRM DRIVERS 
M:	David Airlie <airlied@linux.ie>

L:	dri-devel@lists.freedesktop.org

T:	git git://people.freedesktop.org/~airlied/linux

B:	https://bugs.freedesktop.org/

C:	irc://chat.freenode.net/dri-devel

S:	Maintained

F:	drivers/gpu/drm/

F:	drivers/gpu/vga/
@@ -4076,6 +4082,8 @@ M: Jani Nikula <jani.nikula@linux.intel.com> 
L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

W:	https://01.org/linuxgraphics/

B:	https://01.org/linuxgraphics/documentation/how-report-bugs

C:	irc://chat.freenode.net/intel-gfx

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://anongit.freedesktop.org/drm-intel

S:	Supported

CRA Git | Maintained and supported by SUSTech CRA and CCSE