]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 04:50:02 +0000 (20:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 04:50:02 +0000 (20:50 -0800)
Merge updates from Andrew Morton:

 - various misc bits

 - most of MM (quite a lot of MM material is awaiting the merge of
   linux-next dependencies)

 - kasan

 - printk updates

 - procfs updates

 - MAINTAINERS

 - /lib updates

 - checkpatch updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (123 commits)
  init: reduce rootwait polling interval time to 5ms
  binfmt_elf: use vmalloc() for allocation of vma_filesz
  checkpatch: don't emit unified-diff error for rename-only patches
  checkpatch: don't check c99 types like uint8_t under tools
  checkpatch: avoid multiple line dereferences
  checkpatch: don't check .pl files, improve absolute path commit log test
  scripts/checkpatch.pl: fix spelling
  checkpatch: don't try to get maintained status when --no-tree is given
  lib/ida: document locking requirements a bit better
  lib/rbtree.c: fix typo in comment of ____rb_erase_color
  lib/Kconfig.debug: make CONFIG_STRICT_DEVMEM depend on CONFIG_DEVMEM
  MAINTAINERS: add drm and drm/i915 irc channels
  MAINTAINERS: add "C:" for URI for chat where developers hang out
  MAINTAINERS: add drm and drm/i915 bug filing info
  MAINTAINERS: add "B:" for URI where to file bugs
  get_maintainer: look for arbitrary letter prefixes in sections
  printk: add Kconfig option to set default console loglevel
  printk/sound: handle more message headers
  printk/btrfs: handle more message headers
  printk/kdb: handle more message headers
  ...

1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/kernel/ldt.c
kernel/fork.c
kernel/sys.c
lib/radix-tree.c
mm/compaction.c
mm/memcontrol.c
mm/page_alloc.c
mm/vmscan.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sys.c
Simple merge
Simple merge
diff --cc mm/compaction.c
Simple merge
diff --cc mm/memcontrol.c
index 6c2043509fb52c2a130c8c98f9edeead52707d37,91dfc7c5ce8f6229003009b2e75d3056acc5912e..175ec51c346dc8050eb8c646dfbdf6a9e50224a2
@@@ -5774,8 -5785,18 +5776,19 @@@ static int __init mem_cgroup_init(void
  {
        int cpu, node;
  
 -      hotcpu_notifier(memcg_cpu_hotplug_callback, 0);
+ #ifndef CONFIG_SLOB
+       /*
+        * Kmem cache creation is mostly done with the slab_mutex held,
+        * so use a special workqueue to avoid stalling all worker
+        * threads in case lots of cgroups are created simultaneously.
+        */
+       memcg_kmem_cache_create_wq =
+               alloc_ordered_workqueue("memcg_kmem_cache_create", 0);
+       BUG_ON(!memcg_kmem_cache_create_wq);
+ #endif
 +      cpuhp_setup_state_nocalls(CPUHP_MM_MEMCQ_DEAD, "mm/memctrl:dead", NULL,
 +                                memcg_hotplug_cpu_dead);
  
        for_each_possible_cpu(cpu)
                INIT_WORK(&per_cpu_ptr(&memcg_stock, cpu)->work,
diff --cc mm/page_alloc.c
Simple merge
diff --cc mm/vmscan.c
Simple merge