On 08/02/2016 02:37 PM, Paolo Bonzini wrote: [snip] lots of conflicts all over the place [snip] looks like all architectures collected their merge conflicts for a year in one release... > - arch/s390: also messy. First is hypfs_diag.c where the KVM tree > moved some code and the s390 tree patched it. You have to reapply the > relevant part of commits 6c22c9863760, plus all of e030c1125eab, to > arch/s390/kernel/diag.c. Or pick the linux-next conflict > resolution from http://marc.info/?l=kvm&m=146717549531603&w=2. > Second, there is a conflict in gmap.c between a stable fix and 4.8. > The KVM version here is the correct one. Adding Heiko and Martin, I think this time it was really tricky, but I cannot see a way to avoid these 2 conflicts other than 1. to route everything that conflicts via Martins s390 (thus bypassing the kvm tree) - which then means to route everything in arch/s390/kvm/ via Martin as I would conflict with myself otherwise. Of course cross-architecture changes in arch/*/kvm could then cause other conflicts. 2. do non-kvm via arch tree and wait for a full merge window to add the dependencies. Of course this might not work as things are moving and will slow down things a lot The topic branch variant of x86 only works because Ingos tip request are always pulled before kvm it seems. There is no guaranteed order if s390 or kvm comes first, though - so If I rebase at rc7 on a topic branch from Martin, then Linus might pull s390 changes via Paolo - I do not think this is ok. In the end a merge conflict might be just the right thing over rebases - this time it was just a lot. Lets have a look at the s390 diag move: Actually the kvm patch has the oldest commit date, but the other two patches are real bugfixes that came after that. You would have to rebase the kvm/next tree to avoid the conflict with the 2nd one - which is a bad idea for a tree that has downstream users. We might want to have a better way of just getting the fixes from next. All s390 fixups in next have been there since end of June. So over a month of test coverage. Linus, do you use next as a tie-breaker for merge resolutions or is there a natural way of getting the fixups from Stephen? > > I have pushed my resolution at refs/heads/merge-20160802 (commit > 3d1f53419842) at git://git.kernel.org/pub/scm/virt/kvm/kvm.git. I checked this resolution. To make things complete There is another fixup necessary for s390, see https://patchwork.kernel.org/patch/9162647/ Christian -- 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
