From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rl4Qd-00050s-32 for qemu-devel@nongnu.org; Wed, 11 Jan 2012 15:05:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rl4QX-0002N7-9o for qemu-devel@nongnu.org; Wed, 11 Jan 2012 15:05:47 -0500 Received: from thoth.sbs.de ([192.35.17.2]:33104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rl48D-0006iU-A4 for qemu-devel@nongnu.org; Wed, 11 Jan 2012 14:46:45 -0500 Message-ID: <4F0DE720.3010203@siemens.com> Date: Wed, 11 Jan 2012 20:46:40 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <4F0DE028.4050707@siemens.com> <4F0DE52B.8030105@codemonkey.ws> In-Reply-To: <4F0DE52B.8030105@codemonkey.ws> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] State of KVM bits in linux-headers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Alexander Graf , kvm , qemu-devel On 2012-01-11 20:38, Anthony Liguori wrote: > On 01/11/2012 01:32 PM, Alexander Graf wrote: >> >> On 11.01.2012, at 20:16, Jan Kiszka wrote: >> >>> Hi, >>> >>> I'm a bit unhappy about the current state of our supposed to be >>> automatically sync'ed linux-headers directory in qemu. It has been >>> updated several times against undefined kernel trees, means against >>> neither a released version nor kvm.git. Now, if I run an update against >>> kvm.git + some local change, I get a churn of removals. Same will happen >>> when that local change ever goes upstream before the other stuff got >>> finally committed. >> >> Yes, call me even more unhappy about it :(. > > May I suggest the following: > > 1) Have the header syncing script take a commit hash that's stored in git. Make > script ensure that this has is in Linus' tree. > > 2) Maintain a patch on top of Linus' tree in qemu.git that the script would > apply before actually syncing header files. > > That let's us track how we're differing from upstream in a more reliable fashion. That sounds fairly complicated for a simple problem: Do not merge ABI changes that aren't at least in kvm.git. There are also other reasons for this, beside making the sync harder. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux