Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton: "Six fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element printk: add dummy routine for when CONFIG_PRINTK=n mm/vmscan: fix highidx argument type memcg: remove extra newlines from memcg oom kill log x86, build: replace Perl script with Shell script mm: page_alloc: embed OOM killing naturally into allocation slowpath
Showing
- arch/x86/boot/compressed/Makefile 1 addition, 1 deletionarch/x86/boot/compressed/Makefile
- arch/x86/tools/calc_run_size.pl 0 additions, 39 deletionsarch/x86/tools/calc_run_size.pl
- arch/x86/tools/calc_run_size.sh 42 additions, 0 deletionsarch/x86/tools/calc_run_size.sh
- drivers/rtc/rtc-s5m.c 1 addition, 0 deletionsdrivers/rtc/rtc-s5m.c
- include/linux/oom.h 0 additions, 5 deletionsinclude/linux/oom.h
- include/linux/printk.h 12 additions, 3 deletionsinclude/linux/printk.h
- mm/memcontrol.c 2 additions, 2 deletionsmm/memcontrol.c
- mm/page_alloc.c 35 additions, 47 deletionsmm/page_alloc.c
- mm/vmscan.c 1 addition, 1 deletionmm/vmscan.c
Loading
Please register or sign in to comment