linux-next: manual merge of the block tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/nvme/target/configfs.c

between commit:

  0c48645a7f39 ("nvmet: revert "nvmet: make discovery NQN configurable"")

from Linus' tree and commit:

  73d77c53ff34 ("nvmet: don't fold lines")

from the block tree.

I fixed it up (The former removed some code that was updated by the
latter) 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.



-- 
Cheers,
Stephen Rothwell

Attachment: pgpHZ4hBJGjvu.pgp
Description: OpenPGP digital signature