Hi Jens,
Today's linux-next merge of the block tree got a conflict in
block/cmd-filter.c between commit
bb23b431db7405f6d79f989ad0236bf6428ba1cb ("remove blk_register_filter and
blk_unregister_filter in gendisk") from Linus' tree and commit
d68103f74be7c93f36705651a2115da177308751 ("block: move holder_dir from
disk to part0") from the block tree.
Just a trivial add/removal clash. I fixed it up (see below) and can
carry the fix while necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc block/cmd-filter.c
index 228b644,df450d6..0000000
--- a/block/cmd-filter.c
+++ b/block/cmd-filter.c
@@@ -230,6 -225,4 +226,5 @@@ void blk_unregister_filter(struct gendi
struct blk_cmd_filter *filter = &disk->queue->cmd_filter;
kobject_put(&filter->kobj);
- kobject_put(disk->holder_dir->parent);
}
+EXPORT_SYMBOL(blk_unregister_filter);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
