tree 4b230ab63b5698a44d2948e70a6cc22405c351e9
parent ae05327a00fd47c34dfe25294b359a3f3fef96e8
parent 38b78a5f18584db6fa7441e0f4531b283b0e6725
author Al Viro <viro@zeniv.linux.org.uk> 1463465879 -0400
committer Al Viro <viro@zeniv.linux.org.uk> 1463465879 -0400

Merge branch 'ovl-fixes' into for-linus

Backmerge to resolve a conflict in ovl_lookup_real();
"ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
but it was too late in the cycle to rebase.