diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-13 10:31:19 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-13 10:31:19 +0300 |
commit | 79fc170b1f5c36f486d886bfbd59eb4e62321128 (patch) | |
tree | cb16b5f0a0b4f96e86301c061021d0ba5ea78c00 /fs/romfs | |
parent | cafa017dc5df8abc38308fedae3f1bd7ff67802d (diff) | |
parent | ac081c3be3fae6d0cc3e1862507fca3862d30b67 (diff) | |
download | linux-79fc170b1f5c36f486d886bfbd59eb4e62321128.tar.xz |
Merge branch 'akpm'
Fixes from Andrew:
* akpm:
fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters()
mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
mm/mmap.c: don't clobber partially overlapping VMA with MAP_FIXED_NOREPLACE
ocfs2: fix a GCC warning
Diffstat (limited to 'fs/romfs')
0 files changed, 0 insertions, 0 deletions