linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the sound-asoc tree
Date: Thu, 16 Jun 2011 11:12:00 +0100	[thread overview]
Message-ID: <20110616101200.GA5262@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20110616124055.520eb947.sfr@canb.auug.org.au>

On Thu, Jun 16, 2011 at 12:40:55PM +1000, Stephen Rothwell wrote:

> Today's linux-next merge of the sound-asoc tree failed badly.  It seems
> that it has been rebased on top of next-20110615.   You cannot base a
> tree in linux-next on linux-next itself!

> I have used the version of the sound-asoc tree from next-20110615 for
> today.

Sorry, pushed the wrong tree to the wrong repository.

  reply	other threads:[~2011-06-16 10:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-16  2:40 linux-next: manual merge of the sound-asoc tree Stephen Rothwell
2011-06-16 10:12 ` Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-02-03  1:59 Stephen Rothwell
2012-02-03 10:51 ` Mark Brown
2012-02-07 23:52   ` Stephen Rothwell
2012-02-08 11:25     ` 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=20110616101200.GA5262@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    --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).