From: Len Brown <lenb@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the acpi tree
Date: Sun, 30 Nov 2008 23:11:50 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.00.0811302246100.3314@localhost.localdomain> (raw)
In-Reply-To: <20081201140233.cf65c890.sfr@canb.auug.org.au>
> And if you pull Linus' tree into the acpi tree the conflict will go away
> as well ... but you (who understand the intention of the code) get to fix
> it up rather than me (who is guessing).
Your guess was correct -- the patch with the later commit time
was the correct one to keep.
This was my pilot error. I updated the patch in my release tree
and so you got the updated patch via Linus. But I failed to update
my test tree, so you got the old patch from my test tree.
I've just re-constituted my test branch, so the old patch is gone,
and with it this conflict.
thanks for pointing this out,
-Len
next prev parent reply other threads:[~2008-12-01 4:12 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 2:10 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-12-01 2:55 ` Len Brown
2008-12-01 3:02 ` Stephen Rothwell
2008-12-01 4:11 ` Len Brown [this message]
2008-12-01 4:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-21 2:55 Stephen Rothwell
2008-10-20 4:45 Stephen Rothwell
2008-10-15 4:23 Stephen Rothwell
2008-10-15 16:10 ` Bjorn Helgaas
2008-10-15 4:14 Stephen Rothwell
2008-08-25 5:48 Stephen Rothwell
2008-07-17 4:22 Stephen Rothwell
2008-07-17 7:24 ` Adrian Bunk
2008-07-18 0:37 ` Stephen Rothwell
2008-07-17 4:05 Stephen Rothwell
2008-07-17 4:00 Stephen Rothwell
2008-07-17 4:29 ` Stephen Rothwell
2008-07-16 5:33 Stephen Rothwell
2008-07-16 5:35 ` Harvey Harrison
2008-07-09 3:13 Stephen Rothwell
2008-07-08 3:03 Stephen Rothwell
2008-07-08 8:18 ` Stephen Rothwell
2008-07-08 2:59 Stephen Rothwell
2008-07-08 14:33 ` Rafael J. Wysocki
2008-06-30 5:59 Stephen Rothwell
2008-06-30 6:09 ` Stephen Rothwell
2008-06-30 9:03 ` Ingo Molnar
2008-06-27 3:14 Stephen Rothwell
2008-06-26 4:21 Stephen Rothwell
2008-06-25 4:20 Stephen Rothwell
2008-06-25 7:15 ` Ingo Molnar
2008-06-25 15:59 ` Stephen Rothwell
2008-06-25 16:29 ` Ingo Molnar
2008-06-25 19:18 ` Len Brown
2008-06-25 19:57 ` Ingo Molnar
2008-06-26 22:42 ` Len Brown
2008-06-27 7:17 ` Ingo Molnar
2008-06-25 14:24 ` Stephen Rothwell
2008-06-25 4:13 Stephen Rothwell
2008-06-23 4:19 Stephen Rothwell
2008-06-23 21:56 ` Ingo Molnar
2008-06-16 4:03 Stephen Rothwell
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.0811302246100.3314@localhost.localdomain \
--to=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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