Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755456AbYG3Qgj (ORCPT ); Wed, 30 Jul 2008 12:36:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750860AbYG3Qgb (ORCPT ); Wed, 30 Jul 2008 12:36:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58456 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750818AbYG3Qga (ORCPT ); Wed, 30 Jul 2008 12:36:30 -0400 Message-ID: <4890976D.70103@zytor.com> Date: Wed, 30 Jul 2008 09:31:41 -0700 From: "H. Peter Anvin" User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: Ingo Molnar CC: Suresh Siddha , "tglx@linutronix.de" , "torvalds@linux-foundation.org" , "akpm@linux-foundation.org" , "arjan@linux.intel.com" , "roland@redhat.com" , "drepper@redhat.com" , "mikpe@it.uu.se" , "chrisw@sous-sol.org" , "andi@firstfloor.org" , "linux-kernel@vger.kernel.org" Subject: Re: [patch 0/9] x86, xsave: xsave/xrstor support References: <20080729172917.185593000@linux-os.sc.intel.com> <488FA318.3040905@zytor.com> <20080729232951.GB11223@linux-os.sc.intel.com> <488FAB2B.7050405@zytor.com> <20080730100326.GA9683@elte.hu> In-Reply-To: <20080730100326.GA9683@elte.hu> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1555 Lines: 35 Ingo Molnar wrote: > * H. Peter Anvin wrote: > >>> hpa, these patches just apply fine to tip/master. Can you please >>> arrange the tip/x86/xsave tree accordingly? or do I need to do >>> something else to smooth this process? >> This is awkward, since that means this is "derived topic". Most of >> the changes are orthogonal and relatively trivial to fix up at merge >> time, so I would prefer to keep them separate. > > Well, in this case the conflicts seem to be quite heavy, so i'd suggest > to use the method we have used for x86/x2apic and for xen-64bit: > > Merge the affected topics into tip/x86/core. Then merge x86/core into > x86/xsave, and put the xsave patches ontop of that base. > > This way x86/xsave is a 'derived' topic and optional until it's proven, > but one that is still mergable once all the dependent topics go > upstream. We'd only have to rebase it in the (unlikely) event of there > being some major problem with any of the topics merged into x86/core. > > ok? It somewhat concerns me, because one of the conflicts is generated by collision with x2apic. The rest of them I don't think are too problematic. Most of the conflicts are of the type "orthogonal transformations to the same chunk of code", which doesn't make them less annoying. -hpa -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/