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 21:55:38 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.00.0811302150290.3314@localhost.localdomain> (raw)
In-Reply-To: <20081201131029.58f6d00c.sfr@canb.auug.org.au>
On Mon, 1 Dec 2008, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/acpi/blacklist.c between commit
> a6e0887f21bbab337ee32d9c0a84d7c0b6e9141b ("ACPI: delete OSI(Linux) DMI
> dmesg spam") from Linus' tree and commit
> 865596071bb89ec67a44b0ef2da172e0e733ce16 ("ACPI: delete OSI(Linux) DMI
> dmesg spam") from the acpi tree.
>
> The former had a slightly later commit time, so I used that. Please fix
> up the conflict in the acpi tree.
Hi Stephen,
Like linux-next, pulling the acpi tree into old copies of itself
doesn't work.
This is because I occasionally have to revise various patches and generate
"clean history" for the upstream pull into Linus' tree.
Also, I occasionally re-base branches within the tree up to
newer baselines so that they are easier to test vs upstream.
So if you pull the acpi tree into a copy of Linus' tree
then this type of conflict will go away.
thanks,
-Len
next prev parent reply other threads:[~2008-12-01 2:55 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 [this message]
2008-12-01 3:02 ` Stephen Rothwell
2008-12-01 4:11 ` Len Brown
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.0811302150290.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