tree cb16b5f0a0b4f96e86301c061021d0ba5ea78c00
parent cafa017dc5df8abc38308fedae3f1bd7ff67802d
parent ac081c3be3fae6d0cc3e1862507fca3862d30b67
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1539415879 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1539415879 +0200

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