lkml.org 
[lkml]   [2018]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the f2fs tree with the vfs-fixes tree
On Mon, May 14, 2018 at 10:26:24AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the f2fs tree got a conflict in:
>
> fs/f2fs/namei.c
>
> between commit:
>
> 1e2e547a93a0 ("do d_instantiate/unlock_new_inode combinations safely")
>
> from the vfs-fixes tree and commit:
>
> ab3835aae642 ("f2fs: call unlock_new_inode() before d_instantiate()")
>
> from the f2fs tree.
>
> I think that the vfs-fixes commit supercedes the f2fs tree one, so I
> used that.

Yes, it does.

\
 
 \ /
  Last update: 2018-05-14 02:37    [W:0.071 / U:0.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site