Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "16 patches This includes a new rtc driver for the Abracon AB x80x and isn't very appropriate for -rc2. It was still being fiddled with a bit during the merge window and I fell asleep during -rc1" [ So I took the new driver, it seems small and won't regress anything. I'm a softy. - Linus ] * emailed patches from Andrew Morton <akpm@linux-foundation.org>: rtc: armada38x: fix concurrency access in armada38x_rtc_set_time ocfs2: dlm: fix race between purge and get lock resource nilfs2: fix sanity check of btree level in nilfs_btree_root_broken() util_macros.h: have array pointer point to array of constants configfs: init configfs module earlier at boot time mm/hwpoison-inject: check PageLRU of hpage mm/hwpoison-inject: fix refcounting in no-injection case mm: soft-offline: fix num_poisoned_pages counting on concurrent events rtc: add rtc-abx80x, a driver for the Abracon AB x80x i2c rtc Documentation: bindings: add abracon,abx80x kasan: show gcc version requirements in Kconfig and Documentation mm/memory-failure: call shake_page() when error hits thp tail page lib: delete lib/find_last_bit.c MAINTAINERS: add co-maintainer for LED subsystem zram: add Designated Reviewer for zram in MAINTAINERS revert "zram: move compact_store() to sysfs functions area"
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/rtc/abracon,abx80x.txt 30 additions, 0 deletionsDocumentation/devicetree/bindings/rtc/abracon,abx80x.txt
- Documentation/kasan.txt 5 additions, 3 deletionsDocumentation/kasan.txt
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- drivers/block/zram/zram_drv.c 23 additions, 0 deletionsdrivers/block/zram/zram_drv.c
- drivers/rtc/Kconfig 10 additions, 0 deletionsdrivers/rtc/Kconfig
- drivers/rtc/Makefile 1 addition, 0 deletionsdrivers/rtc/Makefile
- drivers/rtc/rtc-abx80x.c 307 additions, 0 deletionsdrivers/rtc/rtc-abx80x.c
- drivers/rtc/rtc-armada38x.c 12 additions, 12 deletionsdrivers/rtc/rtc-armada38x.c
- fs/configfs/mount.c 1 addition, 1 deletionfs/configfs/mount.c
- fs/nilfs2/btree.c 1 addition, 1 deletionfs/nilfs2/btree.c
- fs/ocfs2/dlm/dlmmaster.c 13 additions, 0 deletionsfs/ocfs2/dlm/dlmmaster.c
- include/linux/nilfs2_fs.h 1 addition, 1 deletioninclude/linux/nilfs2_fs.h
- include/linux/util_macros.h 1 addition, 1 deletioninclude/linux/util_macros.h
- lib/Kconfig.kasan 6 additions, 2 deletionslib/Kconfig.kasan
- lib/find_last_bit.c 0 additions, 41 deletionslib/find_last_bit.c
- mm/hwpoison-inject.c 8 additions, 5 deletionsmm/hwpoison-inject.c
- mm/memory-failure.c 8 additions, 8 deletionsmm/memory-failure.c
Please register or sign in to comment