public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Dave Airlie <airlied@linux.ie>
Subject: Re: linux-next: question about the sound tree
Date: Thu, 17 May 2012 07:51:34 +0200	[thread overview]
Message-ID: <s5hipfvbbix.wl%tiwai@suse.de> (raw)
In-Reply-To: <20120517092438.fce7979fcd25c1fca03268f0@canb.auug.org.au>

Stephen,

At Thu, 17 May 2012 09:24:38 +1000,
Stephen Rothwell wrote:
> 
> Hi Takashi,
> 
> I am just curious as to why the drm tree has been merged into the sound
> tree.  This, of course, means that the drm tree has to remain stable (at
> least up to commit 218c872bf828 "Merge tag
> 'drm-intel-next-2012-05-06-merged' of
> git://people.freedesktop.org/~danvet/drm-intel into drm-core-next").

This is a part of the support of the audio client for VGA-switcheroo.
Three patches to vga_switcheroo.o and its clients are needed.
Since vga_switcheroo.c was changed for 3.5, I had to rebase my works
on the recent drm branch, and Dave suggested to pick up his
drm-next-core branch (and pulled my branch to his tree, too).

The development was done in a separate branch (topic/hda-switcheroo)
in sound git tree, and yesterday I merged it to for-next branch.
If this causes a problem, I can get it out again easily.  Just let me
know.

For a branch to send to Linus, I'll re-merge (not rebase, of course)
these topic branches to make them straight, and reasons shall be
mentioned in the merge commits.


thanks,

Takashi

  reply	other threads:[~2012-05-17  5:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-16 23:24 linux-next: question about the sound tree Stephen Rothwell
2012-05-17  5:51 ` Takashi Iwai [this message]
2012-05-17  7:01   ` Stephen Rothwell

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=s5hipfvbbix.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=airlied@linux.ie \
    --cc=linux-next@vger.kernel.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