[lkml]   [2018]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the f2fs tree with the vfs-fixes tree
Hi all,

Today's linux-next merge of the f2fs tree got a conflict in:


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.

I fixed it up (see above) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2018-05-14 02:26    [W:0.031 / U:1.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site