linux/arch
Linus Torvalds df32e43a54 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
  ...
2014-01-21 19:05:45 -08:00
..
alpha arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 2014-01-12 10:37:15 +01:00
arc arch: Re-sort some Kbuild files to hopefully help avoid some conflicts 2014-01-13 21:56:54 -08:00
arm Merge branch 'akpm' (incoming from Andrew) 2014-01-21 19:05:45 -08:00
arm64 - CPU suspend support on top of PSCI (firmware Power State Coordination 2014-01-20 15:40:44 -08:00
avr32 arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 2014-01-12 10:37:15 +01:00
blackfin arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 2014-01-12 10:37:15 +01:00
c6x Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-11-19 10:40:00 -08:00
cris arch: Re-sort some Kbuild files to hopefully help avoid some conflicts 2014-01-13 21:56:54 -08:00
frv arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 2014-01-12 10:37:15 +01:00
hexagon arch: Re-sort some Kbuild files to hopefully help avoid some conflicts 2014-01-13 21:56:54 -08:00
ia64 mm, show_mem: remove SHOW_MEM_FILTER_PAGE_COUNT 2014-01-21 16:19:44 -08:00
m32r arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 2014-01-12 10:37:15 +01:00
m68k Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-01-20 10:42:08 -08:00
metag memblock: make memblock_set_node() support different memblock_type 2014-01-21 16:19:44 -08:00
microblaze memblock: make memblock_set_node() support different memblock_type 2014-01-21 16:19:44 -08:00
mips Merge branch 'core-stackprotector-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-01-20 10:26:31 -08:00
mn10300 arch: Re-sort some Kbuild files to hopefully help avoid some conflicts 2014-01-13 21:56:54 -08:00
openrisc OpenRISC updates for 3.13 2013-11-15 14:26:38 -08:00
parisc mm, show_mem: remove SHOW_MEM_FILTER_PAGE_COUNT 2014-01-21 16:19:44 -08:00
powerpc memblock: make memblock_set_node() support different memblock_type 2014-01-21 16:19:44 -08:00
s390 Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-01-20 10:23:08 -08:00
score score: remove "select HAVE_GENERIC_HARDIRQS" again 2014-01-21 16:19:41 -08:00
sh memblock: make memblock_set_node() support different memblock_type 2014-01-21 16:19:44 -08:00
sparc memblock: make memblock_set_node() support different memblock_type 2014-01-21 16:19:44 -08:00
tile arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 2014-01-12 10:37:15 +01:00
um um: Build always with -mcmodel=large on 64bit 2013-12-01 13:06:51 +01:00
unicore32 mm, show_mem: remove SHOW_MEM_FILTER_PAGE_COUNT 2014-01-21 16:19:44 -08:00
x86 x86/mm: memblock: switch to use NUMA_NO_NODE 2014-01-21 16:19:47 -08:00
xtensa GPIO tree bulk changes for v3.14 2014-01-21 10:09:12 -08:00
.gitignore
Kconfig stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG 2013-12-20 09:38:40 +01:00