On 11.01.2012, at 20:46, Jan Kiszka wrote: > 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. Let's just try to get my patch queue into kvm.git asap and then never to push linux-header updates before they hit kvm.git again. That's easier than setting up any complicated processes or scripts. Alex -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html