diff options
author | Linus Torvalds | 2014-01-22 04:05:45 +0100 |
---|---|---|
committer | Linus Torvalds | 2014-01-22 04:05:45 +0100 |
commit | df32e43a54d04eda35d2859beaf90e3864d53288 (patch) | |
tree | 7a61cf658b2949bd426285eb9902be7758ced1ba /kernel/trace | |
parent | Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/l... (diff) | |
parent | mm/migrate: remove unused function, fail_migrate_page() (diff) | |
download | kernel-qcow2-linux-df32e43a54d04eda35d2859beaf90e3864d53288.tar.gz kernel-qcow2-linux-df32e43a54d04eda35d2859beaf90e3864d53288.tar.xz kernel-qcow2-linux-df32e43a54d04eda35d2859beaf90e3864d53288.zip |
Merge branch 'akpm' (incoming from Andrew)
Merge first patch-bomb from Andrew Morton:
- a couple of misc things
- inotify/fsnotify work from Jan
- ocfs2 updates (partial)
- about half of MM
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (117 commits)
mm/migrate: remove unused function, fail_migrate_page()
mm/migrate: remove putback_lru_pages, fix comment on putback_movable_pages
mm/migrate: correct failure handling if !hugepage_migration_support()
mm/migrate: add comment about permanent failure path
mm, page_alloc: warn for non-blockable __GFP_NOFAIL allocation failure
mm: compaction: reset scanner positions immediately when they meet
mm: compaction: do not mark unmovable pageblocks as skipped in async compaction
mm: compaction: detect when scanners meet in isolate_freepages
mm: compaction: reset cached scanner pfn's before reading them
mm: compaction: encapsulate defer reset logic
mm: compaction: trace compaction begin and end
memcg, oom: lock mem_cgroup_print_oom_info
sched: add tracepoints related to NUMA task migration
mm: numa: do not automatically migrate KSM pages
mm: numa: trace tasks that fail migration due to rate limiting
mm: numa: limit scope of lock for NUMA migrate rate limiting
mm: numa: make NUMA-migrate related functions static
lib/show_mem.c: show num_poisoned_pages when oom
mm/hwpoison: add '#' to hwpoison_inject
mm/memblock: use WARN_ONCE when MAX_NUMNODES passed as input parameter
...
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions