From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paul Mackerras <paulus@samba.org>
Subject: Re: [PULL 0/7] ppc patch queue 2013-03-22
Date: Tue, 26 Mar 2013 12:59:04 +1100
Message-ID: <20130326015904.GA31060@drongo>
References: <1364250070.26945.18@snotra>
 <AE7AB988-30BD-4462-A8F9-B141000F791F@suse.de>
 <1364252043.26945.19@snotra>
 <C623B7FC-2550-4B21-83E5-FD32D2E0B823@suse.de>
 <1364253381.26945.20@snotra>
 <2EB96F21-A7C5-420A-9D4F-CE0358D15657@suse.de>
 <20130326013312.GO22179@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Alexander Graf <agraf@suse.de>,
	Scott Wood <scottwood@freescale.com>, kvm-ppc@vger.kernel.org,
	"kvm@vger.kernel.org mailing list" <kvm@vger.kernel.org>,
	Marcelo Tosatti <mtosatti@redhat.com>
To: Gleb Natapov <gleb@redhat.com>
Return-path: <kvm-ppc-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20130326013312.GO22179@redhat.com>
Sender: kvm-ppc-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Tue, Mar 26, 2013 at 03:33:12AM +0200, Gleb Natapov wrote:
> On Tue, Mar 26, 2013 at 12:35:09AM +0100, Alexander Graf wrote:
> > I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
> > 
> If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.

Why not?  In the circumstances it seems perfectly reasonable to me.
Git should merge the branches without any problem, and even if it
doesn't, Linus is good at fixing merge conflicts.

Paul.