From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Date: Thu, 11 Apr 2013 13:45:15 +0000 Subject: Re: [PULL 0/7] ppc patch queue 2013-03-22 Message-Id: <20130411134515.GB478@amt.cnet> List-Id: References: <1364250070.26945.18@snotra> <1364252043.26945.19@snotra> <1364253381.26945.20@snotra> <2EB96F21-A7C5-420A-9D4F-CE0358D15657@suse.de> <20130326013312.GO22179@redhat.com> <20130326015904.GA31060@drongo> In-Reply-To: <20130326015904.GA31060@drongo> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Paul Mackerras Cc: Gleb Natapov , Alexander Graf , Scott Wood , kvm-ppc@vger.kernel.org, "kvm@vger.kernel.org mailing list" On Tue, Mar 26, 2013 at 12:59:04PM +1100, Paul Mackerras wrote: > 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. Yes, should avoid duplicate commits but its not fatal for them to exist.