linux-next: manual merge of the block tree with the ext4 tree

Stephen Rothwell
2016-07-15T04:33:32Z

Hi all,

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

fs/ext4/crypto.c

between commit:

a7550b30ab70 ("ext4 crypto: migrate into vfs's crypto engine")

from the ext4 tree and commits:

4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
60a40096a3b2 ("ext4: use bio op helprs in ext4 crypto code")

from the block tree.

I fixed it up (the ext4 tree removed the file, so I did that) 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