Messages in this thread | | | Date | Sun, 17 May 2009 12:26:40 +0200 | From | Borislav Petkov <> | Subject | Re: [PATCH 0/15 v2] ide-atapi: remove pc->buf and misc cleanups |
| |
Hi,
On Sun, May 17, 2009 at 07:08:35AM +0900, Tejun Heo wrote: > Bartlomiej Zolnierkiewicz wrote: > >> It also got rebased ontop of block/for-2.6.31 after Tejun's stuff got merged. > ... > > 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... > > Oh.. please use block commit. Jens didn't pull in my tree but applied > patches on top of the block tree, so my commits shouldn't be in any > official trees.
ok, this means we'll have to synchronize a bit here. I just scanned the tj/block-peek-fetch changes and there will IMHO be one conflict point with my patchset - ide_retry_pc() in ide-atapi but FWICS it won't be a big pain to merge it since the two patchsets touch different functionality.
So, I could wait till you sync with Jens after he has pulled tj/block-peek-fetch and I rebase my changes on top of it. I could do that quite fast and we'll be hitting the merge window alright.
Opinions? Better ideas?
-- Regards/Gruss, Boris.
| |