From: Len Brown <lenb@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
sedat.dilek@gmail.com, Andi Kleen <ak@linux.intel.com>,
Linux ACPI <linux-acpi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [git pull request] ACPI patches for 2.6.36.merge
Date: Tue, 24 Aug 2010 18:35:30 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.00.1008241815120.29078@localhost.localdomain> (raw)
In-Reply-To: <20100816124300.e72258c9.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-08-24 22:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-15 10:41 [git pull request] ACPI patches for 2.6.36.merge Sedat Dilek
2010-08-15 11:13 ` Sedat Dilek
2010-08-15 18:15 ` Linus Torvalds
2010-08-15 20:30 ` Andrew Morton
2010-08-15 21:04 ` Linus Torvalds
2010-08-16 1:21 ` Andrew Morton
2010-08-16 1:35 ` Linus Torvalds
2010-08-16 2:43 ` Stephen Rothwell
2010-08-24 22:35 ` Len Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-08-15 5:12 Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.00.1008241815120.29078@localhost.localdomain \
--to=lenb@kernel.org \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sedat.dilek@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox