From: Len Brown <lenb@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the idle-test tree with the tree
Date: Sun, 29 May 2011 22:50:52 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.02.1105292247420.10035@arrandale.kernel.org> (raw)
In-Reply-To: <20110530122531.53399126.sfr@canb.auug.org.au>
> Today's linux-next merge of the idle-test tree got a conflict in
> arch/x86/include/asm/processor.h, arch/x86/kernel/cpu/common.c and
> arch/x86/kernel/process.c between commits from Linus' tree and similar
> commits from the idle-test tree.
>
> I used the versions from Linus' tree as they seem to have been committed
> more recently (this may not be the correct solution).
I'll refresh the offending patch in idle-test -- upstream
changed out from under it.
thanks,
-Len
prev parent reply other threads:[~2011-05-30 2:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-30 2:25 linux-next: manual merge of the idle-test tree with the tree Stephen Rothwell
2011-05-30 2:50 ` Len Brown [this message]
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.02.1105292247420.10035@arrandale.kernel.org \
--to=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.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