[lkml]   [2018]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the f2fs tree with the fscrypt tree
Hi Jaegeuk,

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


between commit:

393c038f5c55 ("f2fs: switch to fscrypt ->symlink() helper functions")

from the fscrypt tree and commit:

acbf054d537d ("f2fs: inject fault to kzalloc")

from the f2fs tree.

I fixed it up (I just dropped the change to this file from the latter
commit) 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

 \ /
  Last update: 2018-01-14 23:27    [W:0.121 / U:0.392 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site