Messages in this thread | | | Subject | linux-next: manual merge of the akpm-current tree with the vfs tree | From | Michael Ellerman <> | Date | Wed, 17 Jun 2015 13:24:13 +1000 |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/ufs/namei.c
between commit:
a50e4a02ad69 "ufs: don't bother with lock_ufs()/unlock_ufs() for directory access"
from the vfs tree and commit:
2ce1efe3965b "fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"
from the akpm-current tree.
I fixed it up by taking the vfs version and can carry the fix as necessary (no action is required).
cheers
| |