linux-next: build failure after merge of the block tree
in [Kernel]
|
Prev: [PATCH 1/1] perf tui: Fix build problem with slang <= 2.0.6
Next: numa x86_64 use generic percpu var numa_node_id implementation fix3 [was Re: mmotm 2010-05-14-13-33 uploaded]
From: Stephen Rothwell on 17 May 2010 23:40 Hi Jens, After merging the block tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: block/blk-core.c: In function 'laptop_mode_timer_fn': block/blk-core.c:503: error: too few arguments to function 'bdi_start_writeback' Caused by commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: fix WB_SYNC_NONE writeback from umount") from the block tree interacting with commit 42bd225c0ba7c95af39293d39a950c48e7e5cb23 (""laptop-mode: Make flushes per-device" fix") also from the block tree. The merge 6205ed4658a0df8c2879519977bbed6853014016 should have changed the code in block/blk-core.c that moved from mm/page-writeback.c. Mind you, I think that the change to laptop_mode_timer_fn in commit e913fc825dc685a444cb4c1d0f9d32f372f59861 was wrong anyway (the 0 should have been added at the end, surely). I have used the block tree from next-20100517 for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Jens Axboe on 18 May 2010 05:00 On Tue, May 18 2010, Stephen Rothwell wrote: > Hi Jens, > > After merging the block tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > block/blk-core.c: In function 'laptop_mode_timer_fn': > block/blk-core.c:503: error: too few arguments to function 'bdi_start_writeback' > > Caused by commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: > fix WB_SYNC_NONE writeback from umount") from the block tree interacting > with commit 42bd225c0ba7c95af39293d39a950c48e7e5cb23 (""laptop-mode: Make > flushes per-device" fix") also from the block tree. The merge > 6205ed4658a0df8c2879519977bbed6853014016 should have changed the code in > block/blk-core.c that moved from mm/page-writeback.c. > > Mind you, I think that the change to laptop_mode_timer_fn in commit > e913fc825dc685a444cb4c1d0f9d32f372f59861 was wrong anyway (the 0 should > have been added at the end, surely). > > I have used the block tree from next-20100517 for today. Thanks, it looks like a merge/commit error on for-next alone, for-2.6.35 is fine. I'll make sure this gets fixed up now. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 18 May 2010 06:30 On Tue, 18 May 2010 10:56:13 +0200 Jens Axboe <jens.axboe(a)oracle.com> wrote: > > Thanks, it looks like a merge/commit error on for-next alone, for-2.6.35 > is fine. I'll make sure this gets fixed up now. So why is for-2.6.35 different from for-next? -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Jens Axboe on 18 May 2010 07:00
On Tue, May 18 2010, Stephen Rothwell wrote: > On Tue, 18 May 2010 10:56:13 +0200 Jens Axboe <jens.axboe(a)oracle.com> wrote: > > > > Thanks, it looks like a merge/commit error on for-next alone, for-2.6.35 > > is fine. I'll make sure this gets fixed up now. > > So why is for-2.6.35 different from for-next? Because I had a for-linus branch at one point which was headed for 2.6.34 (which has been merged now) which was changed and merged with for-2.6.35 to form for-next. But now it should just be a copy. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |