Merge branch 'akpm' (Fixups from Andrew)
Merge misc fixes from Andrew Morton: "Followups, fixes and some random stuff I found on the internet." * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (11 patches) perf: fix duplicate header inclusion memcg, kmem: fix build error when CONFIG_INET is disabled rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS rapidio: fix comment lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf rapidio: update for destination ID allocation rapidio: update asynchronous discovery initialization rapidio: use msleep in discovery wait mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip() arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups arch/powerpc/platforms/pseries/hotplug-memory.c: fix section handling code
No related branches found
No related tags found
Showing
- arch/powerpc/platforms/pseries/hotplug-memory.c 6 additions, 5 deletionsarch/powerpc/platforms/pseries/hotplug-memory.c
- drivers/rapidio/rio-scan.c 17 additions, 23 deletionsdrivers/rapidio/rio-scan.c
- drivers/rapidio/rio.c 47 additions, 28 deletionsdrivers/rapidio/rio.c
- drivers/rtc/Kconfig 3 additions, 0 deletionsdrivers/rtc/Kconfig
- include/linux/memcontrol.h 2 additions, 2 deletionsinclude/linux/memcontrol.h
- include/linux/pageblock-flags.h 3 additions, 3 deletionsinclude/linux/pageblock-flags.h
- include/linux/rio.h 1 addition, 2 deletionsinclude/linux/rio.h
- lib/kasprintf.c 1 addition, 1 deletionlib/kasprintf.c
- tools/perf/util/include/linux/rbtree.h 0 additions, 1 deletiontools/perf/util/include/linux/rbtree.h
Loading
Please register or sign in to comment