From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the idle-test tree with the tree
Date: Mon, 30 May 2011 12:25:31 +1000 [thread overview]
Message-ID: <20110530122531.53399126.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Len,
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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-30 2:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-30 2:25 Stephen Rothwell [this message]
2011-05-30 2:50 ` linux-next: manual merge of the idle-test tree with the tree 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=20110530122531.53399126.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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