diff for duplicates of <20160714101545.GB18175@mwanda> diff --git a/a/1.txt b/N1/1.txt index 751431b..b8f2234 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ index 02b4672..df3f270 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -2038,7 +2038,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, - if (type = KVMPPC_DEBUG_NONE) + if (type == KVMPPC_DEBUG_NONE) continue; - if (type & !(KVMPPC_DEBUG_WATCH_READ | diff --git a/a/content_digest b/N1/content_digest index 518c969..dabb4fb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,17 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] KVM: PPC: fix a sanity check\0" - "Date\0Thu, 14 Jul 2016 10:15:46 +0000\0" + "Date\0Thu, 14 Jul 2016 13:15:46 +0300\0" "To\0Alexander Graf <agraf@suse.com>" " Bharat Bhushan <r65777@freescale.com>\0" - "Cc\0kvm@vger.kernel.org" + "Cc\0Paolo Bonzini <pbonzini@redhat.com>" " Radim Kr\304\215m\303\241\305\231 <rkrcmar@redhat.com>" - kernel-janitors@vger.kernel.org - kvm-ppc@vger.kernel.org + Benjamin Herrenschmidt <benh@kernel.crashing.org> Paul Mackerras <paulus@samba.org> - Paolo Bonzini <pbonzini@redhat.com> - " linuxppc-dev@lists.ozlabs.org\0" + Michael Ellerman <mpe@ellerman.id.au> + kvm-ppc@vger.kernel.org + kvm@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "We use logical negate where bitwise negate was intended. It means that\n" @@ -23,7 +25,7 @@ "--- a/arch/powerpc/kvm/booke.c\n" "+++ b/arch/powerpc/kvm/booke.c\n" "@@ -2038,7 +2038,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,\n" - " \t\tif (type = KVMPPC_DEBUG_NONE)\n" + " \t\tif (type == KVMPPC_DEBUG_NONE)\n" " \t\t\tcontinue;\n" " \n" "-\t\tif (type & !(KVMPPC_DEBUG_WATCH_READ |\n" @@ -32,4 +34,4 @@ " \t\t\t KVMPPC_DEBUG_BREAKPOINT))\n" " \t\t\treturn -EINVAL;" -08ffe04973f5b3a050647f4cd7139eb525db51387f7f874f2d1733342631b817 +ee446f43f85f352540adb4632a59d22aa587d12c8761fb06508e99c80549d7fc
diff --git a/a/1.txt b/N2/1.txt index 751431b..750cc1d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,7 +9,7 @@ index 02b4672..df3f270 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -2038,7 +2038,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, - if (type = KVMPPC_DEBUG_NONE) + if (type == KVMPPC_DEBUG_NONE) continue; - if (type & !(KVMPPC_DEBUG_WATCH_READ | @@ -17,3 +17,7 @@ index 02b4672..df3f270 100644 KVMPPC_DEBUG_WATCH_WRITE | KVMPPC_DEBUG_BREAKPOINT)) return -EINVAL; +_______________________________________________ +Linuxppc-dev mailing list +Linuxppc-dev@lists.ozlabs.org +https://lists.ozlabs.org/listinfo/linuxppc-dev diff --git a/a/content_digest b/N2/content_digest index 518c969..001a784 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] KVM: PPC: fix a sanity check\0" - "Date\0Thu, 14 Jul 2016 10:15:46 +0000\0" + "Date\0Thu, 14 Jul 2016 13:15:46 +0300\0" "To\0Alexander Graf <agraf@suse.com>" " Bharat Bhushan <r65777@freescale.com>\0" "Cc\0kvm@vger.kernel.org" @@ -23,13 +23,17 @@ "--- a/arch/powerpc/kvm/booke.c\n" "+++ b/arch/powerpc/kvm/booke.c\n" "@@ -2038,7 +2038,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,\n" - " \t\tif (type = KVMPPC_DEBUG_NONE)\n" + " \t\tif (type == KVMPPC_DEBUG_NONE)\n" " \t\t\tcontinue;\n" " \n" "-\t\tif (type & !(KVMPPC_DEBUG_WATCH_READ |\n" "+\t\tif (type & ~(KVMPPC_DEBUG_WATCH_READ |\n" " \t\t\t KVMPPC_DEBUG_WATCH_WRITE |\n" " \t\t\t KVMPPC_DEBUG_BREAKPOINT))\n" - " \t\t\treturn -EINVAL;" + " \t\t\treturn -EINVAL;\n" + "_______________________________________________\n" + "Linuxppc-dev mailing list\n" + "Linuxppc-dev@lists.ozlabs.org\n" + https://lists.ozlabs.org/listinfo/linuxppc-dev -08ffe04973f5b3a050647f4cd7139eb525db51387f7f874f2d1733342631b817 +98eb208e28e9ed4ac190f97ccf2aa2e4fc8812ec51fa069f2a5c109c2f6048a2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.