linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Sam Ravnborg <sam@ravnborg.org>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the tests tree
Date: Tue, 22 Jul 2008 17:59:45 +0530	[thread overview]
Message-ID: <20080722122945.GC4379@in.ibm.com> (raw)
In-Reply-To: <20080722135642.c54172c9.sfr@canb.auug.org.au>

On Tue, Jul 22, 2008 at 01:56:42PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got conflicts in
> lib/Kconfig.debug against Linus' tree.
> 
> I have been carrying the fix to these conflicts for a while but no that
> they are in Linus' tree, you should rebase/merge your tree against his
> and carefully check/test the results.
> 
> My current fixup patch to your tests/Kconfig is below.  It may not be
> complete.

Thanks Stephen!

Sam,

Can you please request Linus to pull the tests tree now that 2.6.27
window is open?

Thanks,
Ananth

  reply	other threads:[~2008-07-22 12:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-22  3:56 linux-next: manual merge of the tests tree Stephen Rothwell
2008-07-22 12:29 ` Ananth N Mavinakayanahalli [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-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=20080722122945.GC4379@in.ibm.com \
    --to=ananth@in.ibm.com \
    --cc=linux-next@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).