linux-next: manual merge of the bitmap tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the bitmap tree got a conflict in:

  arch/x86/kvm/hyperv.c

between commit:

  ea8c66fe8d8f ("KVM: x86: hyper-v: fix type of valid_bank_mask")

from Linus' tree and commit:

  017a983d0ecf ("KVM: x86: hyper-v: replace bitmap_weight() with hweight64()")

from the bitmap tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpPMlid3ynhA.pgp
Description: OpenPGP digital signature