Merge branch 'akpm' (Andrew's patch-bomb)
Merge fixes from Andrew Morton. Random drivers and some VM fixes. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (17 commits) mm: compaction: Abort async compaction if locks are contended or taking too long mm: have order > 0 compaction start near a pageblock with free pages rapidio/tsi721: fix unused variable compiler warning rapidio/tsi721: fix inbound doorbell interrupt handling drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode mm: correct page->pfmemalloc to fix deactivate_slab regression drivers/rtc/rtc-pcf2123.c: initialize dynamic sysfs attributes mm/compaction.c: fix deferring compaction mistake drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources string: do not export memweight() to userspace hugetlb: update hugetlbpage.txt checkpatch: add control statement test to SINGLE_STATEMENT_DO_WHILE_MACRO mm: hugetlbfs: correctly populate shared pmd cciss: fix incorrect scsi status reporting Documentation: update mount option in filesystem/vfat.txt mm: change nr_ptes BUG_ON to WARN_ON cs5535-clockevt: typo, it's MFGPT, not MFPGT
No related branches found
No related tags found
Showing
- Documentation/filesystems/vfat.txt 11 additions, 0 deletionsDocumentation/filesystems/vfat.txt
- Documentation/vm/hugetlbpage.txt 8 additions, 2 deletionsDocumentation/vm/hugetlbpage.txt
- arch/x86/mm/hugetlbpage.c 16 additions, 5 deletionsarch/x86/mm/hugetlbpage.c
- drivers/block/cciss_scsi.c 1 addition, 10 deletionsdrivers/block/cciss_scsi.c
- drivers/clocksource/cs5535-clockevt.c 2 additions, 2 deletionsdrivers/clocksource/cs5535-clockevt.c
- drivers/misc/sgi-xp/xpc_uv.c 65 additions, 19 deletionsdrivers/misc/sgi-xp/xpc_uv.c
- drivers/rapidio/devices/tsi721.c 11 additions, 1 deletiondrivers/rapidio/devices/tsi721.c
- drivers/rtc/rtc-pcf2123.c 2 additions, 0 deletionsdrivers/rtc/rtc-pcf2123.c
- drivers/rtc/rtc-rs5c348.c 5 additions, 2 deletionsdrivers/rtc/rtc-rs5c348.c
- include/linux/compaction.h 2 additions, 2 deletionsinclude/linux/compaction.h
- include/linux/string.h 1 addition, 1 deletioninclude/linux/string.h
- mm/compaction.c 108 additions, 48 deletionsmm/compaction.c
- mm/internal.h 1 addition, 0 deletionsmm/internal.h
- mm/mmap.c 1 addition, 1 deletionmm/mmap.c
- mm/page_alloc.c 22 additions, 16 deletionsmm/page_alloc.c
- scripts/checkpatch.pl 2 additions, 1 deletionscripts/checkpatch.pl
Loading
Please register or sign in to comment