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

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

Merge branch 'akpm' (patches from Andrew) 

Merge updates from Andrew Morton:

 - fsnotify updates

 - ocfs2 updates

 - all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (127 commits)
  console: don't prefer first registered if DT specifies stdout-path
  cred: simpler, 1D supplementary groups
  CREDITS: update Pavel's information, add GPG key, remove snail mail address
  mailmap: add Johan Hovold
  .gitattributes: set git diff driver for C source code files
  uprobes: remove function declarations from arch/{mips,s390}
  spelling.txt: "modeled" is spelt correctly
  nmi_backtrace: generate one-line reports for idle cpus
  arch/tile: adopt the new nmi_backtrace framework
  nmi_backtrace: do a local dump_stack() instead of a self-NMI
  nmi_backtrace: add more trigger_*_cpu_backtrace() methods
  min/max: remove sparse warnings when they're nested
  Documentation/filesystems/proc.txt: add more description for maps/smaps
  mm, proc: fix region lost in /proc/self/smaps
  proc: fix timerslack_ns CAP_SYS_NICE check when adjusting self
  proc: add LSM hook checks to /proc/<tid>/timerslack_ns
  proc: relax /proc/<tid>/timerslack_ns capability requirements
  meminfo: break apart a very long seq_printf with #ifdefs
  seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char
  proc: faster /proc/*/status
  ...
parents c913fc41 05fd007e

.gitattributes

0 → 100644
+2 −0
Original line number Diff line number Diff line 
*.c   diff=cpp

*.h   diff=cpp

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ Jean Tourrilhes <jt@hpl.hp.com> 
Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -2296,11 +2296,11 @@ D: Initial implementation of VC's, pty's and select() 


N: Pavel Machek

E: pavel@ucw.cz

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd

P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,

D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,

D: work on suspend-to-ram/disk, killing duplicates from ioctl32

S: Volkova 1131

S: 198 00 Praha 9

D: work on suspend-to-ram/disk, killing duplicates from ioctl32,

D: Altera SoCFPGA and Nokia N900 support.

S: Czech Republic



N: Paul Mackerras

Documentation/filesystems/proc.txt

+12 −0
Original line number Diff line number Diff line
@@ -515,6 +515,18 @@ be vanished or the reverse -- new added. 
This file is only present if the CONFIG_MMU kernel configuration option is

enabled.



Note: reading /proc/PID/maps or /proc/PID/smaps is inherently racy (consistent

output can be achieved only in the single read call).

This typically manifests when doing partial reads of these files while the

memory map is being modified.  Despite the races, we do provide the following

guarantees:



1) The mapped addresses never go backwards, which implies no two

   regions will ever overlap.

2) If there is something at a given vaddr during the entirety of the

   life of the smaps/maps walk, there will be some output for it.





The /proc/PID/clear_refs is used to reset the PG_Referenced and ACCESSED/YOUNG

bits on both physical and virtual pages associated with a process, and the

soft-dirty bit on pte (see Documentation/vm/soft-dirty.txt for details).

arch/alpha/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ config ALPHA 
	select GENERIC_IRQ_SHOW

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select AUDIT_ARCH

	select GENERIC_CLOCKEVENTS

	select GENERIC_SMP_IDLE_THREAD