LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Sam Ravnborg <sam@ravnborg.org>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for March 4
Date: Tue, 04 Mar 2008 22:01:47 +0100	[thread overview]
Message-ID: <47CDB8BB.9020909@s5r6.in-berlin.de> (raw)
In-Reply-To: <20080304223947.375be10b.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> There were three minor merge problems.

One of them is tests.git's lib/Kconfig.debug.  linux1394-2.6.git's 
commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one 
causing it.

Stephen, should one of me and Sam adjust his -next branch?  (This kind 
of conflict will be trivially avoided in the merge window; so resolving 
it now would mainly mean one manual(?) step less for Stephen.)
-- 
Stefan Richter
-=====-==--- --== --=--
http://arcgraph.de/sr/

  parent reply	other threads:[~2008-03-04 21:02 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-04 11:39 Stephen Rothwell
2008-03-04 17:54 ` Dan Williams
2008-03-04 23:25   ` Stephen Rothwell
2008-03-04 21:01 ` Stefan Richter [this message]
2008-03-05  7:41   ` Sam Ravnborg
2008-03-05  7:57   ` Stephen Rothwell
2009-03-04  7:06 Stephen Rothwell
2009-03-04 21:57 ` Geert Uytterhoeven
2009-03-04 22:44   ` Stephen Rothwell
2009-03-05  9:11     ` Stephen Rothwell
2009-03-05 10:27       ` Geert Uytterhoeven
2010-03-04  6:26 Stephen Rothwell
2011-03-04  7:00 Stephen Rothwell
2011-03-06 22:52 ` Mariusz Kozlowski
2011-03-07 11:46   ` Mark 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=47CDB8BB.9020909@s5r6.in-berlin.de \
    --to=stefanr@s5r6.in-berlin.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: linux-next: Tree for March 4' \
    /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

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).