Messages in this thread |  | | | Date | Thu, 21 May 2009 00:45:53 +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: > That would preserve the logical sequence of patches, yes. However, Jens > is a bit pressed for time, so I agreed to do this in SCSI.
That is entirely up to you and Jens as the maintainers. Someone will just need to fix up the conflicts during the merge window.
Given the conflict resolution patch sent to me by Boaz, I can cope in linux-next for now.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |