Re: 2.6.15 cfq oops

Jens Axboe
2006-01-09T14:18:47Z

On Mon, Jan 09 2006, Sergey Vlasov wrote:
> On Mon, 9 Jan 2006 11:58:01 +0100 Jens Axboe wrote:
>
> [skip]
> > I've merged this up for 2.6.16-rc inclusion, probably should go to
> > stabel as well.
> >
> > ---
> >
> > [PATCH] Kill blk_attempt_remerge()
> >
> > It's a bad interface, and it's always done too late. Remove it.
> >
> > Signed-off-by: Jens Axboe <axboe@suse.de>
> >
> [skip]
> > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
> > index 1539603..2e44d81 100644
> > --- a/drivers/cdrom/cdrom.c
> > +++ b/drivers/cdrom/cdrom.c
> > @@ -426,7 +426,7 @@ int register_cdrom(struct cdrom_device_i
> > cdi->exit = cdrom_mrw_exit;
> >
> > if (cdi->disk)
> > - cdi->cdda_method = CDDA_BPC_FULL;
> > + cdi->cdda_method = CDDA_BPC_SINGLE;
> > else
> > cdi->cdda_method = CDDA_OLD;
>
> Does not seem to be related to the rest of patch...

Indeed, dirty git tree...

--
Jens Axboe