linux-next: manual merge of the bitmap tree with the kvm tree
Subsystems (3)
[email protected]
maintainerHi all,
Today's linux-next merge of the bitmap tree got a conflict in:
arch/s390/kvm/kvm-s390.c
between commit:
a54d806688fe1 ("KVM: Keep memslots in tree-based structures instead of array-based ones")
from the kvm tree and commit:
523f4c8e86c3f ("all: replace find_next{,_zero}_bit with find_first{,_zero}_bit where appropriate")
from the bitmap tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
arch/s390/kvm/kvm-s390.c +0 -0
@@@ -1988,9 -2016,10 +1988,9 @@@ static unsigned long kvm_s390_next_dirt ofs =0 ; } ofs =find_next_bit (kvm_second_dirty_bitmap (ms), ms->npages, ofs); - while ((slotidx > 0) && (ofs >= ms->npages)) { - slotidx--; - ms = slots->memslots + slotidx; + while (ofs >= ms->npages && (mnode = rb_next(mnode))) { + ms = container_of(mnode, struct kvm_memory_slot, gfn_node[slots->node_idx]); - ofs =find_next_bit (kvm_second_dirty_bitmap (ms), ms->npages,0 ); + ofs =find_first_bit (kvm_second_dirty_bitmap (ms), ms->npages); }return ms->base_gfn + ofs; }