On 15.05.2012, at 14:49, Christian Borntraeger wrote: > Alex, > > here is a patch that uses the newly introduced KVM_CAP_S390_COW > to get rid of the s390 specific ifdef mess in the main path and > moves it into a separate function. > > This patch also contains a diff agains linux-headers. What is the > right approach to do that?
The right approach to linux-headers changes is to split the patch into 2 separate patches. One patch with the linux-headers update. Another patch with the actual functional change. That way I can delay the inclusion into QEMU until the API changing patch makes Avi's tree. Until that point, the API isn't considered stable, so ioctl and CAP numbers could still change. When it's in, I'd usually redo the linux-headers patch and apply your functional patch on top. That way we ensure that we're always in a consistent state with linux-headers. Alex
