From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
linux-next@vger.kernel.org, Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the tests tree
Date: Thu, 26 Jun 2008 09:06:58 -0700 [thread overview]
Message-ID: <20080626160658.GC10859@linux.vnet.ibm.com> (raw)
In-Reply-To: <20080625150315.ab536f8a.sfr@canb.auug.org.au>
On Wed, Jun 25, 2008 at 03:03:15PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
>
> Today's linux-next merge of the tests tree got a conflict in
> lib/Kconfig.debug between commit 31a72bce0bd6f3e0114009288bccbc96376eeeca
> ("rcu: make rcutorture more vicious: reinstate boot-time testing") from
> the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
> rcutorture to tests/") from the tests tree.
>
> Paul has added another CONFIG option related to the RCU tests. I fixed it
> up, hopefully correctly. Probably worth a look when I publish the tree.
Let me know, I will be happy to look it over.
Thanx, Paul
next prev parent reply other threads:[~2008-06-26 16:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 5:03 linux-next: manual merge of the tests tree Stephen Rothwell
2008-06-25 5:20 ` Ananth N Mavinakayanahalli
2008-06-26 16:06 ` Paul E. McKenney [this message]
-- 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-08-15 4:59 Stephen Rothwell
2008-08-18 4:42 ` Ananth N Mavinakayanahalli
2008-07-22 3:56 Stephen Rothwell
2008-07-22 12:29 ` Ananth N Mavinakayanahalli
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=20080626160658.GC10859@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=ananth@in.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.