Hi Andrew, After merging the akpm tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/block_dev.c: In function 'set_blocksize': fs/block_dev.c:135:2: error: implicit declaration of function 'prio_tree_empty' [-Werror=implicit-function-declaration] Caused by commit b87570f5d349 ("Fix a crash when block device is read and block size is changed at the same time") from the block tree interacting with commit "prio_tree: remove" from the akpm tree. I added the following merge fix patch for today. From: Stephen Rothwell Date: Fri, 28 Sep 2012 16:21:10 +1000 Subject: [PATCH] prio_tree: fix fs/block_dev.c for removal of prio_tree Signed-off-by: Stephen Rothwell --- fs/block_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index 246a81e..165b01f 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "internal.h" @@ -132,7 +133,7 @@ int set_blocksize(struct block_device *bdev, int size) /* Check that the block device is not memory mapped */ mapping = bdev->bd_inode->i_mapping; mutex_lock(&mapping->i_mmap_mutex); - if (!prio_tree_empty(&mapping->i_mmap) || + if (!RB_EMPTY_ROOT(&mapping->i_mmap) || !list_empty(&mapping->i_mmap_nonlinear)) { mutex_unlock(&mapping->i_mmap_mutex); percpu_up_write(&bdev->bd_block_size_semaphore); -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au