Merge branch 'akpm' (patches from Andrew)

Browse source

Merge misc fixes from Andrew Morton:
 "The gcc-4.4.4 workaround has actually been merged into a KVM tree by
  Paolo but it is stuck in linux-next and mainline needs it"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  arch/x86/kvm/mmu.c: work around gcc-4.4.4 bug
  sched, numa: do not hint for NUMA balancing on VM_MIXEDMAP mappings
  zsmalloc: fix a null pointer dereference in destroy_handle_cache()
  mm: memcontrol: fix false-positive VM_BUG_ON() on -rt
  checkpatch: fix "GLOBAL_INITIALISERS" test
  zram: clear disk io accounting when reset zram device
  memcg: do not call reclaim if !__GFP_WAIT
  mm/memory_hotplug.c: set zone->wait_table to null after freeing it

...

This commit is contained in:

Linus Torvalds 2015-06-10 16:43:53 -07:00

parent e64f638483 5ec45a192f

commit f5278565be

7 changed files with 20 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

arch/x86/kvm/mmu.c

View file

2

drivers/block/zram/zram_drv.c

View file

2

kernel/sched/fair.c

View file

6

mm/memcontrol.c

View file

4

mm/memory_hotplug.c

View file

3

mm/zsmalloc.c

View file

4

scripts/checkpatch.pl

View file