Merge branch 'akpm-current/current'

Conflicts:
	mm/memcontrol.c

diff --cc Documentation/cgroups/memory.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/printk-formats.txt
Simple merge

diff --cc MAINTAINERS
index 32b5fc7f0dd8b7ae2216d7cb1e735dfe01eeff34,185a753d2d042e780f1e5f7baac2d0aad9e47983..64ad4a27239ad2a63453bd113d84f3cd056e41a8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4387,24 -4390,15 +4394,21 @@@ L:   netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
 -IBM Power Virtual SCSI/FC Device Drivers
 -M:    Robert Jennings <rcj@linux.vnet.ibm.com>
 +IBM Power Virtual SCSI Device Drivers
 +M:    Nathan Fontenot <nfont@linux.vnet.ibm.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/ibmvscsi/ibmvscsi*
 +F:    drivers/scsi/ibmvscsi/viosrp.h
 +
 +IBM Power Virtual FC Device Drivers
 +M:    Brian King <brking@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 -F:    drivers/scsi/ibmvscsi/
 -X:    drivers/scsi/ibmvscsi/ibmvstgt.c
 +F:    drivers/scsi/ibmvscsi/ibmvfc*
  
  IBM ServeRAID RAID DRIVER
- P:    Jack Hammer
- M:    Dave Jeffery <ipslinux@adaptec.com>
- W:    http://www.developer.ibm.com/welcome/netfinity/serveraid.html
- S:    Supported
+ S:    Orphan
  F:    drivers/scsi/ips.*
  
  ICH LPC AND GPIO DRIVER

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/ia64/include/asm/topology.h
Simple merge

diff --cc arch/powerpc/platforms/52xx/efika.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc block/bio.c
Simple merge

diff --cc block/bounce.c
Simple merge

diff --cc drivers/base/Kconfig
Simple merge

diff --cc drivers/base/dma-contiguous.c
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc fs/9p/vfs_file.c
Simple merge

diff --cc fs/affs/file.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/ceph/addr.c
Simple merge

diff --cc fs/cifs/smb2ops.c
Simple merge

diff --cc fs/cifs/smb2pdu.c
Simple merge

diff --cc fs/cifs/smb2pdu.h
Simple merge

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/ext4/page-io.c
Simple merge

diff --cc fs/f2fs/checkpoint.c
Simple merge

diff --cc fs/f2fs/node.c
Simple merge

diff --cc fs/fat/inode.c
Simple merge

diff --cc fs/fuse/file.c
Simple merge

diff --cc fs/gfs2/aops.c
Simple merge

diff --cc fs/ntfs/file.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/buffer_head.h
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/memblock.h
Simple merge

diff --cc include/linux/page-flags.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/smp.h
Simple merge

diff --cc include/linux/thread_info.h
Simple merge

diff --cc include/linux/topology.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/acct.c
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc kernel/cpuset.c
Simple merge

diff --cc kernel/kmod.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/deadline.c
Simple merge

diff --cc kernel/sched/rt.c
Simple merge

diff --cc kernel/seccomp.c
Simple merge

diff --cc kernel/smp.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/Makefile
Simple merge

diff --cc mm/dmapool.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memblock.c
Simple merge

diff --cc mm/memcontrol.c
index 9d1dfb217f46f6991a60422006c7a5ceec2e6881,309d773a3506f92e908429962d54f12dd1d7797c..d27e85742ac91c63e96941b12968d7fffc28eea1
--- 1/mm/memcontrol.c
--- 2/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -5447,22 -5334,14 +5339,14 @@@ static int mem_cgroup_swappiness_write(
                                       struct cftype *cft, u64 val)
  {
        struct mem_cgroup *memcg = mem_cgroup_from_css(css);
-       struct mem_cgroup *parent = mem_cgroup_from_css(memcg->css.parent);
  
-       if (val > 100 || !parent)
+       if (val > 100)
                return -EINVAL;
  
-       mutex_lock(&memcg_create_mutex);
- 
-       /* If under hierarchy, only empty-root can set this value */
-       if ((parent->use_hierarchy) || memcg_has_children(memcg)) {
-               mutex_unlock(&memcg_create_mutex);
-               return -EINVAL;
-       }
- 
-       memcg->swappiness = val;
- 
-       mutex_unlock(&memcg_create_mutex);
 -      if (css_parent(css))
++      if (css->parent)
+               memcg->swappiness = val;
+       else
+               vm_swappiness = val;
  
        return 0;
  }
@@@ -5794,18 -5673,11 +5678,11 @@@ static int mem_cgroup_oom_control_write
        struct cftype *cft, u64 val)
  {
        struct mem_cgroup *memcg = mem_cgroup_from_css(css);
-       struct mem_cgroup *parent = mem_cgroup_from_css(memcg->css.parent);
  
        /* cannot set to root cgroup and only 0 and 1 are allowed */
-       if (!parent || !((val == 0) || (val == 1)))
 -      if (!css_parent(css) || !((val == 0) || (val == 1)))
++      if (!css->parent || !((val == 0) || (val == 1)))
                return -EINVAL;
  
-       mutex_lock(&memcg_create_mutex);
-       /* oom-kill-disable is a flag for subhierarchy. */
-       if ((parent->use_hierarchy) || memcg_has_children(memcg)) {
-               mutex_unlock(&memcg_create_mutex);
-               return -EINVAL;
-       }
        memcg->oom_kill_disable = val;
        if (!val)
                memcg_oom_recover(memcg);

diff --cc mm/memory.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/page_io.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/vmscan.c
Simple merge