Linus Torvalds
68d47a137c
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup ...
Pull cgroup hierarchy update from Tejun Heo:
"Currently, different cgroup subsystems handle nested cgroups
completely differently. There's no consistency among subsystems and
the behaviors often are outright broken.
People at least seem to agree that the broken hierarhcy behaviors need
to be weeded out if any progress is gonna be made on this front and
that the fallouts from deprecating the broken behaviors should be
acceptable especially given that the current behaviors don't make much
sense when nested.
This patch makes cgroup emit warning messages if cgroups for
subsystems with broken hierarchy behavior are nested to prepare for
fixing them in the future. This was put in a separate branch because
more related changes were expected (didn't make it this round) and the
memory cgroup wanted to pull in this and make changes on top."
* 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them
2012-10-02 10:52:28 -07:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
bootmem: Fix the short description of reserve_bootmem()
2012-08-27 07:57:21 -07:00
bounce: allow use of bounce pool via config option
2012-07-18 16:40:35 -04:00
->encode_fh() API change
2012-05-29 23:28:33 -04:00
mm: compaction: Abort async compaction if locks are contended or taking too long
2012-08-21 16:45:03 -07:00
mm, fadvise: don't return -EINVAL when filesystem cannot implement fadvise()
2012-07-31 18:42:42 -07:00
block: move down direct IO plugging
2012-08-09 15:23:09 +02:00
fs: Protect write paths by sb_start_write - sb_end_write
2012-07-31 09:45:47 +04:00
mm/frontswap: cleanup doc and comment error
2012-07-23 11:16:20 -04:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
thp: avoid VM_BUG_ON page_count(page) false positives in __collapse_huge_page_copy
2012-09-28 08:38:09 -07:00
mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables
2012-07-31 18:42:50 -07:00
hugetlb/cgroup: remove exclude and wakeup rmdir calls from migrate
2012-07-31 18:42:41 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: compaction: Abort async compaction if locks are contended or taking too long
2012-08-21 16:45:03 -07:00
mm: factor out memory isolate functions
2012-07-31 18:42:45 -07:00
kmemleak: Replace list_for_each_continue_rcu with new interface
2012-09-23 07:42:52 -07:00
mm: Hold a file reference in madvise_remove
2012-07-06 10:34:38 -07:00
mm: factor out memory isolate functions
2012-07-31 18:42:45 -07:00
mm/memblock: Use NULL instead of 0 for pointers
2012-09-05 08:32:30 +02:00
cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them
2012-09-14 12:01:16 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
memory hotplug: fix section info double registration bug
2012-09-17 15:00:38 -07:00
Remove user-triggerable BUG from mpol_to_str
2012-09-06 09:37:58 -07:00
mempool: add @gfp_mask to mempool_create_node()
2012-06-25 11:53:47 +02:00
mm: memcg: fix compaction/migration failing due to memcg limits
2012-07-31 18:42:48 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-08-23 21:48:41 -07:00
mm: mmu_notifier: fix freed page still mapped in secondary MMU
2012-07-31 18:42:49 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: account the total_vm in the vm_stat_account()
2012-07-31 18:42:39 -07:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
nommu: fix compilation of nommu.c
2012-06-04 17:17:31 -04:00
mm, memcg: move all oom handling to memcontrol.c
2012-07-31 18:42:45 -07:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
mm/page_alloc: fix the page address of higher page's buddy calculation
2012-09-17 15:00:38 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
memory-hotplug: fix kswapd looping forever problem
2012-07-31 18:42:45 -07:00
mm: fix kernel-doc warnings
2012-06-20 14:39:36 -07:00
mm: fix kernel-doc warnings
2012-06-20 14:39:36 -07:00
kmemleak: Fix the kmemleak tracking of the percpu areas with !SMP
2012-05-09 10:13:29 -07:00
arch/tile: allow building Linux with transparent huge pages enabled
2012-05-25 12:48:21 -04:00
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
2012-05-31 17:49:32 -07:00
mm: move readahead syscall to mm/readahead.c
2012-05-29 16:22:23 -07:00
mm: remove swap token code
2012-05-29 16:22:19 -07:00
xattr: extract simple_xattr code from tmpfs
2012-08-24 15:55:33 -07:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
mm, sl[aou]b: Use a common mutex definition
2012-07-09 12:13:41 +03:00
mm: Fix build warning in kmem_cache_create()
2012-07-30 13:15:40 +03:00
slob: Fix early boot kernel crash
2012-07-12 10:13:22 +03:00
slub: consider pfmemalloc_match() in get_partial_node()
2012-09-17 15:00:38 -07:00
mm/sparse: remove index_init_lock
2012-07-31 18:42:49 -07:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
mm: add support for a filesystem to activate swap files and use direct_IO for writing swap pages
2012-07-31 18:42:47 -07:00
mm: swapfile: clean up unuse_pte race handling
2012-07-31 18:42:48 -07:00
mm/fs: remove truncate_range
2012-05-29 16:22:23 -07:00
new helper: vm_mmap_pgoff()
2012-06-01 10:37:18 -04:00
mm: make vb_alloc() more foolproof
2012-07-31 18:42:39 -07:00
memory hotplug: reset pgdat->kswapd to NULL if creating kernel thread fails
2012-09-17 15:00:37 -07:00
workqueue: make deferrable delayed_work initializer names consistent
2012-08-21 13:18:23 -07:00
68d47a137c