[ So long with my idyllic ide git tree experience... ] On Sunday 17 May 2009 00:08:35 Tejun Heo wrote: > Bartlomiej Zolnierkiewicz wrote: > >> It also got rebased ontop of block/for-2.6.31 after Tejun's stuff got merged. > ... "..." == a lot of merge conflicts... > > 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... ...which are coming up before tj/block-peek-fetch and which simply shouldn't be there since there were no further modifications to these files in ide-2.6.git/for-next > 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. I took a closer look and it seems the same is true for your earlier IDE patchsets... IOW they were also applied on top of block tree even though your commits have been pulled into ide-2.6.git/for-next long before. This seems to be wrong in terms of git usage and definitely is not what we have agreed on w.r.t. handling of those patchsets. Jens? -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
