diff --git a/[refs] b/[refs]
index 8541265ae7fa..b7c602f241da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 125e18745f16685f69a34fd6130d47598fc4bf54
+refs/heads/master: 98bd34eaf1a7d1f2ed9c4e5d3a9664d3dcdd2159
diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c
index cd885b23cb5c..2ef313a96b66 100644
--- a/trunk/fs/partitions/check.c
+++ b/trunk/fs/partitions/check.c
@@ -484,6 +484,10 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
 		sector_t from = state->parts[p].from;
 		if (!size)
 			continue;
+		if (from + size > get_capacity(disk)) {
+			printk(" %s: p%d exceeds device capacity\n",
+				disk->disk_name, p);
+		}
 		add_partition(disk, p, from, size);
 #ifdef CONFIG_BLK_DEV_MD
 		if (state->parts[p].flags)