From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: Borislav Petkov <petkovbb@googlemail.com>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>, Jens Axboe <axboe@kernel.dk>
Subject: Re: [PATCH 0/15 v2] ide-atapi: remove pc->buf and misc cleanups
Date: Sat, 16 May 2009 21:35:52 +0200 [thread overview]
Message-ID: <200905162135.53084.bzolnier@gmail.com> (raw)
In-Reply-To: <20090516192319.GB6202@liondog.tnic>
On Saturday 16 May 2009 21:23:19 Borislav Petkov wrote:
> Hi,
>
> On Sat, May 16, 2009 at 09:07:38PM +0200, Bartlomiej Zolnierkiewicz wrote:
> > I would love to merge it but I'm hitting merge conflicts...
> >
> > I can pull tj/block-peek-fetch into for-next but not block/for-2.6.31...
> >
> > tj's top commit:
> >
> > author Tejun Heo <tj@kernel.org>
> > Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900)
> > committer Tejun Heo <tj@kernel.org>
> > Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900)
> > commit 18c551bb4944dec0ce2c0a854b6694ed39ab58f6
> > tree a2a59fd27626e930809a20546c0c02e1df498056
> > parent 88fd264e94d01b23339ce614be9141eb2db98e10
> >
> > corresponding blocks's commit:
> >
> > author Tejun Heo <tj@kernel.org>
> > Fri, 8 May 2009 02:54:16 +0000 (11:54 +0900)
> > committer Jens Axboe <jens.axboe@oracle.com>
> > Mon, 11 May 2009 07:52:18 +0000 (09:52 +0200)
> > commit 9934c8c04561413609d2bc38c6b9f268cba774a4
> > tree 30dd8f7be54f9b2e03094de9cd03b6a9ee2909cd
> > parent 2343046826a8ca426b07601d9593ee046c298b68
> >
> > Looking at creation dates I suspect that somewhere along the way
> > something was rebased?
> >
> > One quick temporary solution would be to recreate bp/pc-remove-buf
> > on top of tj/block-peek-fetch...
>
> will do that first thing in the morning and push it for merging.
Cool, please also merge ide-tape DEBUG build fix while at it...
next prev parent reply other threads:[~2009-05-16 19:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-15 5:11 [PATCH 0/15 v2] ide-atapi: remove pc->buf and misc cleanups Borislav Petkov
2009-05-15 5:11 ` [PATCH 01/15] ide-tape: fix potential fs requests bug Borislav Petkov
2009-05-15 5:11 ` [PATCH 02/15] ide-atapi: switch to blk_rq_bytes() on do_request() path Borislav Petkov
2009-05-15 5:11 ` [PATCH 03/15] ide-atapi: switch to rq->resid_len Borislav Petkov
2009-05-15 5:11 ` [PATCH 04/15] ide-atapi: add a len-parameter to ide_queue_pc_tail Borislav Petkov
2009-05-15 5:11 ` [PATCH 05/15] ide-atapi: add a buffer-arg " Borislav Petkov
2009-05-15 5:11 ` [PATCH 06/15] ide-floppy/ide_floppy_get_flexible_disk_page: use local buffer Borislav Petkov
2009-05-15 5:11 ` [PATCH 07/15] ide-floppy/ide_floppy_get_sfrp_bit: " Borislav Petkov
2009-05-15 5:11 ` [PATCH 08/15] ide-floppy/ide_floppy_format_unit: " Borislav Petkov
2009-05-15 5:11 ` [PATCH 09/15] ide-atapi: use local sense buffer Borislav Petkov
2009-05-15 5:11 ` [PATCH 10/15] ide-floppy/ide_floppy_get_format_progress: " Borislav Petkov
2009-05-15 5:11 ` [PATCH 11/15] ide-tape/ide_tape_get_bsize_from_bdesc: use local buffer Borislav Petkov
2009-05-15 5:11 ` [PATCH 12/15] ide-tape: fix READ POSITION cmd handling Borislav Petkov
2009-05-15 5:11 ` [PATCH 13/15] ide-atapi: remove pc->buf Borislav Petkov
2009-05-15 5:11 ` [PATCH 14/15] ide-cd: use whole request_sense buffer in EH Borislav Petkov
2009-05-15 5:11 ` [PATCH 15/15] ide: unify interrupt reason checking Borislav Petkov
2009-05-16 19:07 ` [PATCH 0/15 v2] ide-atapi: remove pc->buf and misc cleanups Bartlomiej Zolnierkiewicz
2009-05-16 19:23 ` Borislav Petkov
2009-05-16 19:35 ` Bartlomiej Zolnierkiewicz [this message]
2009-05-17 10:33 ` Borislav Petkov
2009-05-17 13:12 ` Bartlomiej Zolnierkiewicz
2009-05-16 22:08 ` Tejun Heo
2009-05-17 10:26 ` Borislav Petkov
2009-05-17 10:36 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200905162135.53084.bzolnier@gmail.com \
--to=bzolnier@gmail.com \
--cc=axboe@kernel.dk \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=petkovbb@googlemail.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).