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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tracing tree got a conflict in
block/blk-sysfs.c between commit cd43e26f071524647e660706b784ebcbefbd2e44
("block: Expose stacked device queues in sysfs") from the block tree and
commit 1d54ad6da9192fed5dd3b60224d9f2dfea0dcd82 ("blktrace: add trace/
to /sys/block/sda") from the tracing tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc block/blk-sysfs.c
index 9337e17,26f9ec2..0000000
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@@ -428,7 -390,14 +429,11 @@@ int blk_register_queue(struct gendisk *
  	if (WARN_ON(!q))
  		return -ENXIO;
  
- 	ret = kobject_add(&q->kobj, kobject_get(&disk_to_dev(disk)->kobj),
+ 	ret = blk_trace_init_sysfs(dev);
+ 	if (ret)
+ 		return ret;
+ 
 -	if (!q->request_fn)
 -		return 0;
 -
+ 	ret = kobject_add(&q->kobj, kobject_get(&dev->kobj),
  			  "%s", "queue");
  	if (ret < 0)
  		return ret;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/