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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Tue, 22 Mar 2011 10:33:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Woodhouse <david.woodhouse@...el.com>
Cc:	Jens Axboe <axboe@...nel.dk>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Jarkko Lavinen <jarkko.lavinen@...ia.com>
Subject: Re: linux-next: build failure after merge of the block tree

Hi Guys,

On Thu, 17 Mar 2011 11:45:35 +0100 Jens Axboe <axboe@...nel.dk> wrote:
>
> On 2011-03-17 11:36, David Woodhouse wrote:
> > On Thu, 2011-03-17 at 10:18 +0000, Jens Axboe wrote:
> >>
> >> Can you point me at the commit in question? Generally,
> >> elv_queue_empty()
> >> can be replaced by blk_peek_request(). 
> > 
> > The interesting commit is this one:
> > http://git.infradead.org/mtd-2.6.git/commitdiff/c7519dbf6
> > 
> > The point of it is to enable this
> > http://git.infradead.org/mtd-2.6.git/commitdiff/a32159024
> 
> OK, can you commit a change just changing that to blk_peek_request()?
> That'll avoid the conflict.

I am still reverting those three commits from the mtd tree ...  David, I
assume that you are going to want to ask Linus to merge the mtd tree at
some point soon?
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped