I'll take curtain C:-) Will send you a fresh merge request in about an hour. Sorry for the trouble. thanks, -Len On 03/30/2012 03:32 PM, Linus Torvalds wrote: > On Fri, Mar 30, 2012 at 12:16 PM, Linus Torvalds > <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: >> >> But there's been at least three merges that submaintainers did for me >> this merge window where I looked at their merge and said "No, that's >> wrong, and I would have done it better". Two of those were the nice >> kind of "I left it unmerged, but here's my example merge if you want >> to take it", so the wrong merges didn't ever show up in the tree. But >> yours is now no longer even the top commit in your pile of fixes, so >> now I apparently have to take that *known*incorrect* merge and fix it >> up with an evil merge of my own. > > Ugh. I'm undoing my merge rather than do that evil merge that fixes up yours. > > So I have three choices: > > (a) I can just re-do your merge, and lose the two commits you had on top of it > > (b) I can create a new local branch with your pre-merged state, and > cherry-pick the two commits on top of that, and then merge that, and > then fake out the pull request. > > (c) I can ask you to do that fix up (rebase those two commits on top > of the state before the broken merge), and then you can ask me to pull > again, without the merge - same as (b) really, but I don't have to > fake the pull request message when I create the merge. > > I think I'll do (c), but then probably fall back on (a) if I don't > hear from you. (b) gets me the tree I want, but I don't like faking > pull requests - I've occasionally pulled less than requested (exactly > because I didn't like the top merge), but I try to avoid actually > adding modified commits on top. > > Linus -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
