From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: question about the sound tree
Date: Thu, 17 May 2012 07:51:34 +0200
Message-ID: <s5hipfvbbix.wl%tiwai@suse.de>
References: <20120517092438.fce7979fcd25c1fca03268f0@canb.auug.org.au>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-next-owner@vger.kernel.org>
Received: from cantor2.suse.de ([195.135.220.15]:34727 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754564Ab2EQFvf (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 17 May 2012 01:51:35 -0400
In-Reply-To: <20120517092438.fce7979fcd25c1fca03268f0@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Dave Airlie <airlied@linux.ie>

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