On Thu, 14 May 2009 00:52:31 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Wed, 13 May 2009 17:28:10 +0300 Boaz Harrosh <bharrosh@xxxxxxxxxxx> wrote:
> >
> > I have done the rebase and ran some tests, however I was unable to test these patches
> > as is, because there are some inter tree fallouts.
> >
> > Jens, James, Stephan, I please need your help
> >
> > The situation is like that.
> > - Both block/for-next and scsi/master are based on an old osd upstream-point (v2.6.30-rc3--ce8a7424)
> > - Linus tip has important OSD patches that went in via scsi-rc-fixes which changed Wire format
> > - If I try and merge block/for-next ontop of plain linus/master I get a merge conflict
> > - If I try merge scsi/master block/for-next I get build errors / conflicts
> >
> > So there is no sane tree point that I can test on.
>
> We could ask Jens and James to both merge either Linus' tree or just the
> scsi-rc-fixes tree into their trees. Currently when I merge the scsi
Actually even against v2.6.30-rc3-393-ge9da4d7 (as that was the top of the
scsi-rc-fixes tree when it was merged into Linus' tree).
> tree I get only one very minor conflict. The block tree, on the other
> hand, had quite big problems today - but that was due to interactions
> with the scsi tree.
>
> If the above merges were done, then I suspect that the scsi tree with
> commit 1bfe9caaff367601134c14fc428017419f628f7d ("[SCSI] FC Pass Thru
> support") reverted would merge ok with the block tree and give you a base
> for testing.
This assumes, of course, that neither the scsi or block trees in
linux-next get rebased ...
How about:
base the osd tree on Linus' tree.
test the osd merged with the block tree (rather than rebased on
top of it).
test the osd tree merged with the scsi tree.
test all three merged (with the commit above reverted).
submit the osd tree to linux-next.
The merge conflicts between the block tree and Linus' tree can be
resolved by doing "git checkout block/for-next drivers/block/hd.c
drivers/block/mg_disk.c". (They could also be fixed by the block tree
merging Linus' tree, of course).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpbTuwcpKxQz.pgp
Description: PGP signature
