Re: [PULL 0/7] ppc patch queue 2013-03-22

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 11.04.2013, at 15:45, Marcelo Tosatti wrote:

> 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.

So I may send a pull request against 3.9 with the 3 commits that already are in kvm/next?


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [KVM Development]     [KVM ARM]     [KVM ia64]     [Linux Virtualization]     [Linux USB Devel]     [Linux Video]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux