linux-kernel - Re: linux-next: build failure after merge of the block tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4EEAFF4B.6000802@kernel.dk>
Date:	Fri, 16 Dec 2011 09:20:27 +0100
From:	Jens Axboe <axboe@...nel.dk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>, majianpeng <majianpeng@...il.com>
Subject: Re: linux-next: build failure after merge of the block tree

On 2011-12-16 02:50, Stephen Rothwell wrote:
> Hi Jens,
> 
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> block/cfq-iosched.c: In function 'cfq_init_queue':
> block/cfq-iosched.c:3690:14: error: 'cic_index_lock' undeclared (first use in this function)
> block/cfq-iosched.c:3691:15: error: 'cic_index_ida' undeclared (first use in this function)
> block/cfq-iosched.c:3691:34: error: 'struct cfq_data' has no member named 'cic_index'
> 
> Presumably this was not build tested with CONFIG_CFQ_GROUP_IOSCHED set.
> 
> Caused by commit a73f730d013f ("block, cfq: move cfqd->cic_index to
> q->id") interacting with commit 2984ff38ccf6 ("cfq-iosched: free
> cic_index if blkio_alloc_blkg_stats fails").
> 
> I have used the block tree from next-20111215 for today.

Sorry Stephen, I'll get this merge problem fixed up.

-- 
Jens Axboe

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