From: Al Viro Date: Tue, 17 May 2016 06:17:59 +0000 (-0400) Subject: Merge branch 'ovl-fixes' into for-linus X-Git-Tag: v6.1~16599^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e0162bb8c008fa7742f69d4d4982c8a37b88f95;p=sdk%2Femulator%2Femulator-kernel.git 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. --- 0e0162bb8c008fa7742f69d4d4982c8a37b88f95