Messages in this thread | | | Date | Thu, 21 May 2009 00:42:51 +1000 | From | Stephen Rothwell <> | Subject | Re: [PATCH version 2] [SQUASHME] "FC Pass Thru support" fixed for block/for-2.6.31 tree |
| |
Hi James,
On Wed, 20 May 2009 14:37:20 +0000 James Bottomley <James.Bottomley@HansenPartnership.com> wrote: > > Unfortuantely, I still need the block tree for-next to be rebased up to > the current linus head because of a couple of conflicts: > > CONFLICT (content): Merge conflict in drivers/block/hd.c > CONFLICT (content): Merge conflict in drivers/block/mg_disk.c
As discussed elsewhere, a merge of Linus' tree into the block tree will fix this.
> So they obviously moved into linus head but wasn't taken out of block > for-next.
Indeed.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |