[lkml]   [2016]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the vfs-miklos tree with the vfs tree
Hi Miklos,

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


between commit:

a76b5b04375f ("fs: try to clone files first in vfs_copy_file_range")

from the vfs tree and commit:

b2368d2bb4a5 ("vfs: check file types in vfs_copy_file_range()")

from the vfs-miklos tree.

I fixed it up (I used the vfs tree version) 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.

Darrick, commit a76b5b04375f has no Signed-off-by from you as committer :-(

Stephen Rothwell

 \ /
  Last update: 2016-12-12 00:38    [W:0.023 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site