Messages in this thread | | | Date | Tue, 24 Aug 2010 18:35:30 -0400 (EDT) | From | Len Brown <> | Subject | Re: [git pull request] ACPI patches for 2.6.36.merge |
| |
My bad.
Andrew was right -- I botched a modify/delete merge conflict of two correct patches. I did it at the last minute and then fed the wrong branch ("idle-release" instead of "release") to my build test, send the code, and dropped of the net. multiple mistakes.
Sorry for the sloppiness, I'll do better.
Upon the git merge conflict, it looks like I resorted to pulling andi's original patch out of git, pushing it into quilt on top of rui's delete; and then got fooled by the refresh. Should have caught that both by inspection and by build...
On a positive note, the underlying reason for the conflict was that we are succeeding in deleting a bunch of crufty code that should not need to be maintained at all:-)
thanks, Len Brown, Intel Open Source Technology Center
| |