From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 19:07:51 +0000 (-0700)
Subject: Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux
X-Git-Tag: v2.6.36-rc1~300
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b34d8915c413acb51d837a45fb8747b61f65c020;p=pandora-kernel.git

Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux

* 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux:
  unistd: add __NR_prlimit64 syscall numbers
  rlimits: implement prlimit64 syscall
  rlimits: switch more rlimit syscalls to do_prlimit
  rlimits: redo do_setrlimit to more generic do_prlimit
  rlimits: add rlimit64 structure
  rlimits: do security check under task_lock
  rlimits: allow setrlimit to non-current tasks
  rlimits: split sys_setrlimit
  rlimits: selinux, do rlimits changes under task_lock
  rlimits: make sure ->rlim_max never grows in sys_setrlimit
  rlimits: add task_struct to update_rlimit_cpu
  rlimits: security, add task_struct to setrlimit

Fix up various system call number conflicts.  We not only added fanotify
system calls in the meantime, but asm-generic/unistd.h added a wait4
along with a range of reserved per-architecture system calls.
---

b34d8915c413acb51d837a45fb8747b61f65c020
Reading git-diff-tree failed