linux-next: manual merge of the configfs tree with the vfs-fixes tree
From: Stephen Rothwell
Date: Thu Sep 12 2019 - 09:44:20 EST
Today's linux-next merge of the configfs tree got a conflict in:
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.
Description: OpenPGP digital signature