Merge 7f879e1a ("Merge tag 'ovl-update-5.6' of...

Merge 7f879e1a ("Merge tag 'ovl-update-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs"

) into android-mainline

This handles the conflicts we had with the overlayfs upstream merge
point in a single place.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I243c97135839d901654c89ff0c8b11712341a1c5