From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NMMt8-0005KY-Fg
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:36:02 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NMMt3-0005CM-J7
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:36:01 -0500
Received: from [199.232.76.173] (port=59318 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NMMt3-0005CJ-8X
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:35:57 -0500
Received: from mail-yx0-f188.google.com ([209.85.210.188]:55244)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NMMt2-0003MN-T3
	for qemu-devel@nongnu.org; Sun, 20 Dec 2009 09:35:57 -0500
Received: by yxe26 with SMTP id 26so4318227yxe.4
	for <qemu-devel@nongnu.org>; Sun, 20 Dec 2009 06:35:55 -0800 (PST)
Message-ID: <4B2E3649.30803@codemonkey.ws>
Date: Sun, 20 Dec 2009 08:35:53 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <20091220114812.GA15588@redhat.com>
In-Reply-To: <20091220114812.GA15588@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: stable-0.12 versus master branching?
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: qemu-devel@nongnu.org

Michael S. Tsirkin wrote:
> I am really confused wrt stable 0.12 branching policy.
> For example I see this, in master:
>
> 	commit d587e0787153f0224a6140c5015609963ceaabfb
> 	Author: Anthony Liguori <aliguori@us.ibm.com>
> 	Date:   Mon Dec 14 11:36:53 2009 -0600
>
> 	    Revert "pci: interrupt disable bit support"
>
> 	    This reverts commit 0ea5709a32085f7d14901a09d12bd35f9b267607.
>
> 	    Per discussion with Michael Tsirkin, this is too risky for 0.12
>
> 	    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>
> (this was cherry-picked in stable-0.12 as well).
> From the comment, this revert makes sense for stable-0.12
> but not for master.  Is this an attempt to keep stable and master
> as close as possible? I expected master development to proceed while
> stable-0.12 would get just bugfixes. No?
>   

It was a mistake.  I've already got it recommitted in master.  Just need 
to push.

Regards,

Anthony Liguori

> Thanks,
>
>