From: broonie@kernel•org
To: Yury Norov <yury.norov@gmail•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Maciej S . Szmigiero" <maciej.szmigiero@oracle•com>,
Paolo Bonzini <pbonzini@redhat•com>,
Sean Christopherson <seanjc@google•com>
Subject: linux-next: manual merge of the bitmap tree with the kvm tree
Date: Fri, 10 Dec 2021 19:15:05 +0000 [thread overview]
Message-ID: <20211210191505.1030264-1-broonie@kernel.org> (raw)
Hi 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.
diff --cc arch/s390/kvm/kvm-s390.c
index dd099d3527533,59459960ec3a0..0000000000000
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@@ -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;
}
reply other threads:[~2021-12-10 19:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211210191505.1030264-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maciej.szmigiero@oracle$(echo .)com \
--cc=pbonzini@redhat$(echo .)com \
--cc=seanjc@google$(echo .)com \
--cc=yury.norov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox