[lkml]   [2019]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the configfs tree with the vfs-fixes tree
Hi all,

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


between commit:

e272d4fb74d6 ("configfs: fix a deadlock in configfs_symlink()")

from the vfs-fixes tree and commit:

351e5d869e5a ("configfs: fix a deadlock in configfs_symlink()")

from the configfs tree.

These are slightly different version of the same fix.

I fixed it up (I used the former 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2019-09-12 15:45    [W:0.043 / U:0.828 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site