Hi Jens, Today's linux-next build (powerpc ppc64_defconfig) failed like this: block/genhd.c: In function 'show_partition': block/genhd.c:718: error: 'struct hd_struct' has no member named 'private' block/genhd.c:719: warning: passing argument 1 of 'seq_puts' from incompatible pointer type block/genhd.c:720: error: 'struct hd_struct' has no member named 'private' Caused by the merge because commit ddef43a843f620c6742a06633739887a901ec06b ("block: restore original behavior of /proc/partition when there's no partition") added references to the 'private' member. I removed the offending section of code (see below) assuming the fix referred to in the comment has be done in the block tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ diff --git a/block/genhd.c b/block/genhd.c index 48326f9..0bc4a3e 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -709,17 +709,6 @@ static int show_partition(struct seq_file *seqf, void *v) struct hd_struct *part; char buf[BDEVNAME_SIZE]; - /* - * Print header if start told us to do. This is to preserve - * the original behavior of not printing header if no - * partition exists. This hackery will be removed later with - * class iteration clean up. - */ - if (part->private) { - seq_puts(part, "major minor #blocks name\n\n"); - part->private = NULL; - } - /* Don't show non-partitionable removeable devices or empty devices */ if (!get_capacity(sgp) || (!disk_partitionable(sgp) && (sgp->flags & GENHD_FL_REMOVABLE))) -- 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