lkml.org 
[lkml]   [2015]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Subjectlinux-next: manual merge of the akpm-current tree with the vfs tree
From
Date
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





\
 
 \ /
  Last update: 2015-06-17 05:41    [W:0.016 / U:0.560 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site