On Tue, Apr 13, 2010 at 11:15 AM, Jens Axboe <jens.axboe@oracle.com> wrote:
quoted text
> On Tue, Apr 13 2010, Divyesh Shah wrote:
>> Hi Jens,
>>        If this looks ok to you, can you please queue it up? Btw, after
>> Gui's patches there is 1 merge conflict in your for-2.6.35 branch when
>> applying this patch but it seems pretty straightforward to resolve. In
>> case you'd prefer a clean patch that takes care of the merge conflict
>> please let me know.
>
> I hand applied that one hunk, and committed it.
>
> But...
>
> block/blk-cgroup.c:271: error: redefinition of ?blkiocg_set_start_empty_time?
> block/blk-cgroup.h:208: note: previous definition of ?blkiocg_set_start_empty_time? was here
> block/blk-cgroup.c: In function ?blkiocg_set_start_empty_time?:
> block/blk-cgroup.c:291: error: implicit declaration of function ?blkio_blkg_empty?
> block/blk-cgroup.c:292: error: ?struct blkio_group_stats? has no member named ?start_empty_time?
> block/blk-cgroup.c:293: error: implicit declaration of function ?blkio_mark_blkg_empty?
> make[1]: *** [block/blk-cgroup.o] Error 1
> make: *** [block] Error 2

Ahh.. I see this now with CONFIG_DEBUG_CFQ_IOSCHED not set.
blkiocg_set_empty_start_time() should be within the #ifdef
CONFIG_DEBUG_BLK_CGROUP block.

quoted text
>
> I merged mainline into for-2.6.35 to resolve a merge conflict, but that
> was trivial.

block/cfq-iosched.c: In function 'cfq_forced_dispatch':
block/cfq-iosched.c:2234: error: too few arguments to function
'cfq_slice_expired'

Another compile error after fixing this was due to the merge from
mainline. cfq_slice_expired() now has an extra argument. Fixed that
too. Will send a patch with the 2 fixes in a bit. Sorry for the
breakage.

quoted text
>
> --
> Jens Axboe
>
>
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/