linux-next: manual merge of the device-mapper tree with the block tree

[Stephen Rothwell]

Hi all,

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

  drivers/md/dm.c

between commit:

  89f871af1b26 ("dm: delay registering the gendisk")

from the block tree and commit:

  0a3bec81a409 ("dm ima: measure data on table load")

from the device-mapper tree.

I fixed it up (see below) 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

diff --cc drivers/md/dm.c
index 7981b7287628,2e82757b4ab7..000000000000
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@@ -1997,6 -2001,14 +1998,8 @@@ int dm_create(int minor, struct mapped_
  	if (!md)
  		return -ENXIO;
  
 -	r = dm_sysfs_init(md);
 -	if (r) {
 -		free_dev(md);
 -		return r;
 -	}
 -
+ 	dm_ima_reset_data(md);
+ 
  	*result = md;
  	return 0;
  }

Attachment: pgpI2XgW71nrk.pgp
Description: OpenPGP digital signature