From: Ananth N Mavinakayanahalli <ananth@in•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Ingo Molnar <mingo@elte•hu>
Subject: Re: linux-next: manual merge of the tests tree
Date: Tue, 17 Jun 2008 11:57:16 +0530 [thread overview]
Message-ID: <20080617062716.GB8300@in.ibm.com> (raw)
In-Reply-To: <20080617162256.4a17529b.sfr@canb.auug.org.au>
On Tue, Jun 17, 2008 at 04:22:56PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
>
> Today's linux-next merge of the tests tree got a new conflict in
> lib/Kconfig.debug between commit 1462a200057df08be12f3719e1f37adbd2c6e4d0
> ("Revert "prohibit rcutorture from being compiled into the kernel"") from
> the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
> rcutorture to tests/").
>
> It is trivial and I did the obvious fixup and will carry that.
Thank you Stephen!
Ananth
next prev parent reply other threads:[~2008-06-17 6:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-17 6:22 linux-next: manual merge of the tests tree Stephen Rothwell
2008-06-17 6:26 ` Ingo Molnar
2008-06-17 6:27 ` Ananth N Mavinakayanahalli [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-06-25 5:03 Stephen Rothwell
2008-06-25 5:20 ` Ananth N Mavinakayanahalli
2008-06-26 16:06 ` Paul E. McKenney
2008-07-22 3:56 Stephen Rothwell
2008-07-22 12:29 ` Ananth N Mavinakayanahalli
2008-08-15 4:59 Stephen Rothwell
2008-08-18 4:42 ` Ananth N Mavinakayanahalli
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
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=20080617062716.GB8300@in.ibm.com \
--to=ananth@in$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--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