• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew Morton) · c2d95729
    Linus Torvalds authored
    Merge first patch-bomb from Andrew Morton:
     - Some pidns/fork/exec tweaks
     - OCFS2 updates
     - Most of MM - there remain quite a few memcg parts which depend on
       pending core cgroups changes.  Which might have been already merged -
       I'll check tomorrow...
     - Various misc stuff all over the place
     - A few block bits which I never got around to sending to Jens -
       relatively minor things.
     - MAINTAINERS maintenance
     - A small number of lib/ updates
     - checkpatch updates
     - epoll
     - firmware/dmi-scan
     - Some kprobes work for S390
     - drivers/rtc updates
     - hfsplus feature work
     - vmcore feature work
     - rbtree upgrades
     - AOE updates
     - pktcdvd cleanups
     - PPS
     - memstick
     - w1
     - New "inittmpfs" feature, which does the obvious
     - More IPC work from Davidlohr.
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (303 commits)
      lz4: fix compression/decompression signedness mismatch
      ipc: drop ipc_lock_check
      ipc, shm: drop shm_lock_check
      ipc: drop ipc_lock_by_ptr
      ipc, shm: guard against non-existant vma in shmdt(2)
      ipc: document general ipc locking scheme
      ipc,msg: drop msg_unlock
      ipc: rename ids->rw_mutex
      ipc,shm: shorten critical region for shmat
      ipc,shm: cleanup do_shmat pasta
      ipc,shm: shorten critical region for shmctl
      ipc,shm: make shmctl_nolock lockless
      ipc,shm: introduce shmctl_nolock
      ipc: drop ipcctl_pre_down
      ipc,shm: shorten critical region in shmctl_down
      ipc,shm: introduce lockless functions to obtain the ipc object
      initmpfs: use initramfs if rootfstype= or root= specified
      initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled
      initmpfs: move rootfs code from fs/ramfs/ to init/
      initmpfs: move bdi setup from init_rootfs to init_ramfs