From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 13 Oct 2018 07:31:19 +0000 (+0200)
Subject: Merge branch 'akpm'
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~4394
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=79fc170b1f5c36f486d886bfbd59eb4e62321128;p=mirror_ubuntu-focal-kernel.git

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
---

79fc170b1f5c36f486d886bfbd59eb4e62321128