From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ananth N Mavinakayanahalli <ananth@in•ibm.com>
Cc: linux-next@vger•kernel.org, Sam Ravnborg <sam@ravnborg•org>,
"Paul E. McKenney" <paulmck@linux•vnet.ibm.com>,
Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the tests tree
Date: Fri, 15 Aug 2008 14:59:48 +1000 [thread overview]
Message-ID: <20080815145948.690f8529.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
Hi Ananth,
Today's linux-next merge of the tests tree got a conflict in
lib/Kconfig.debug between commit 67182ae1c42206e516f7efb292b745e826497b24
("rcu, debug: detect stalled grace periods") from the sched tree and
commit 2b9b631dd2507b5480b752bcca946b9767b9bae1 ("Move rcutorture to
tests/") from the tests tree.
I sort of fixed it up.
Ananth, you should try to get the testing stuff into Linus' tree ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-08-15 4:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-15 4:59 Stephen Rothwell [this message]
2008-08-18 4:42 ` linux-next: manual merge of the tests tree Ananth N Mavinakayanahalli
-- strict thread matches above, loose matches on Subject: below --
2008-10-15 6:05 Stephen Rothwell
2008-10-15 14:15 ` Ananth N Mavinakayanahalli
2008-11-05 2:52 ` Stephen Rothwell
2008-11-05 6:06 ` Sam Ravnborg
2008-11-05 14:11 ` Ananth N Mavinakayanahalli
2008-07-22 3:56 Stephen Rothwell
2008-07-22 12:29 ` Ananth N Mavinakayanahalli
2008-06-25 5:03 Stephen Rothwell
2008-06-25 5:20 ` Ananth N Mavinakayanahalli
2008-06-26 16:06 ` Paul E. McKenney
2008-06-17 6:22 Stephen Rothwell
2008-06-17 6:26 ` Ingo Molnar
2008-06-17 6:27 ` Ananth N Mavinakayanahalli
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=20080815145948.690f8529.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ananth@in$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
--cc=sam@ravnborg$(echo .)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