1
0
Fork 0
alistair23-linux/arch
Linus Torvalds b66484cd74 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
  ...
2016-10-07 21:38:00 -07:00
..
alpha nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
arc nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
arm Merge branch 'akpm' (patches from Andrew) 2016-10-07 21:38:00 -07:00
arm64 Merge branch 'akpm' (patches from Andrew) 2016-10-07 21:38:00 -07:00
avr32 Merge branch 'akpm' (patches from Andrew) 2016-10-07 21:38:00 -07:00
blackfin nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
c6x nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
cris nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
frv nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
h8300 nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
hexagon nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
ia64 nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
m32r nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
m68k nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
metag nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
microblaze nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
mips uprobes: remove function declarations from arch/{mips,s390} 2016-10-07 18:46:30 -07:00
mn10300 nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
nios2 nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
openrisc nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
parisc Merge branch 'akpm' (patches from Andrew) 2016-10-07 21:38:00 -07:00
powerpc Merge branch 'akpm' (patches from Andrew) 2016-10-07 21:38:00 -07:00
s390 cred: simpler, 1D supplementary groups 2016-10-07 18:46:30 -07:00
score nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
sh nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
sparc nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
tile nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
um nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
unicore32 nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
x86 nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
xtensa nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00
.gitignore
Kconfig Merge branch 'linus' into x86/asm, to pick up recent fixes 2016-09-15 08:24:53 +02:00