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

Mark Brown
2017-10-30T12:51:52Z

[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]

Hi all,

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

arch/powerpc/kvm/powerpc.c

between commit:

ac64115a66c1 ("KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM")

from Linus' tree and commit:

2a3d6553cbd7 ("KVM: PPC: Tie KVM_CAP_PPC_HTM to the user-visible TM feature")

from the powerpc 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/powerpc/kvm/powerpc.c
index ee279c7f4802,a3746b98ec11..000000000000
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@@ -644,7 -644,8 +644,8 @@@ int kvm_vm_ioctl_check_extension(struc
break;
#endif
case KVM_CAP_PPC_HTM:
- r = cpu_has_feature(CPU_FTR_TM_COMP) && hv_enabled;
- r = is_kvmppc_hv_enabled(kvm) &&
++ r = hv_enabled &&
+ (cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM_COMP);
break;
default:
r = 0;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]