Hi Jens,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/memstick/core/mspro_block.c: In function 'mspro_block_disk_release':
drivers/memstick/core/mspro_block.c:200: error: 'MEMSTICK_PART_SHIFT' undeclared (first use in this function)

Caused by the interaction of commit
1f773dd9deada2ad7efdd71577beb59fae80cdef ("block: don't depend on
consecutive minor space") from the block tree with commit
8e82f8c34b1759ae0d80fe96101746ec51fb1ba4 ("memstick: fix MSProHG 8-bit
interface mode support") form Linus' tree.

The latter removed the definition of MEMSTICK_PART_SHIFT while the former
added a reference.  I added the following patch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <redacted>
Date: Mon, 15 Sep 2008 15:13:07 +1000
Subject: [PATCH] block: fix build of mspro_block

Signed-off-by: Stephen Rothwell <redacted>
---
 drivers/memstick/core/mspro_block.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 055c5f9..82bf649 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c

@@ -197,7 +197,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp)
 static int mspro_block_disk_release(struct gendisk *disk)
 {
 	struct mspro_block_data *msb = disk->private_data;
-	int disk_id = MINOR(disk_devt(disk)) >> MEMSTICK_PART_SHIFT;
+	int disk_id = MINOR(disk_devt(disk)) >> MSPRO_BLOCK_PART_SHIFT;
 
 	mutex_lock(&mspro_block_disk_lock);
 

-- 
1.5.6.5