diff for duplicates of <20161126231350.10321-18-bigeasy@linutronix.de>

diff --git a/a/1.txt b/N1/1.txt
index 3cd35a5..5158136 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ Install the callbacks via the state machine.
 
 Cc: Alexander Graf <agraf@suse.com>
 Cc: Paolo Bonzini <pbonzini@redhat.com>
-Cc: "Radim Krčmář" <rkrcmar@redhat.com>
+Cc: "Radim Kr=C4=8Dm=C3=A1=C5=99" <rkrcmar@redhat.com>
 Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Cc: Paul Mackerras <paulus@samba.org>
 Cc: Michael Ellerman <mpe@ellerman.id.au>
@@ -14,7 +14,8 @@ Cc: linuxppc-dev@lists.ozlabs.org
 Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 ---
- arch/powerpc/kvm/book3s_hv.c | 48 ++++++++++----------------------------------
+ arch/powerpc/kvm/book3s_hv.c | 48 ++++++++++------------------------------=
+----
  include/linux/cpuhotplug.h   |  1 +
  2 files changed, 12 insertions(+), 37 deletions(-)
 
@@ -22,7 +23,8 @@ diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
 index 3686471be32b..39ef1f4a7b02 100644
 --- a/arch/powerpc/kvm/book3s_hv.c
 +++ b/arch/powerpc/kvm/book3s_hv.c
-@@ -2254,12 +2254,12 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master)
+@@ -2254,12 +2254,12 @@ static void post_guest_process(struct kvmppc_vcore =
+*vc, bool is_master)
   * enter the guest. Only do this if it is the primary thread of the
   * core (not if a subcore) that is entering the guest.
   */
@@ -30,7 +32,7 @@ index 3686471be32b..39ef1f4a7b02 100644
 +static inline int kvmppc_clear_host_core(unsigned int cpu)
  {
  	int core;
- 
+=20
  	if (!kvmppc_host_rm_ops_hv || cpu_thread_in_core(cpu))
 -		return;
 +		return 0;
@@ -39,11 +41,11 @@ index 3686471be32b..39ef1f4a7b02 100644
  	 * later in kvmppc_start_thread and we need ensure that state is
 @@ -2267,6 +2267,7 @@ static inline void kvmppc_clear_host_core(int cpu)
  	 */
- 	core = cpu >> threads_shift;
- 	kvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host = 0;
+ 	core =3D cpu >> threads_shift;
+ 	kvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host =3D 0;
 +	return 0;
  }
- 
+=20
  /*
 @@ -2274,12 +2275,12 @@ static inline void kvmppc_clear_host_core(int cpu)
   * Only need to do this if it is the primary thread of the core that is
@@ -53,29 +55,31 @@ index 3686471be32b..39ef1f4a7b02 100644
 +static inline int kvmppc_set_host_core(unsigned int cpu)
  {
  	int core;
- 
+=20
  	if (!kvmppc_host_rm_ops_hv || cpu_thread_in_core(cpu))
 -		return;
 +		return 0;
- 
+=20
  	/*
  	 * Memory barrier can be omitted here because we do a spin_unlock
 @@ -2287,6 +2288,7 @@ static inline void kvmppc_set_host_core(int cpu)
  	 */
- 	core = cpu >> threads_shift;
- 	kvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host = 1;
+ 	core =3D cpu >> threads_shift;
+ 	kvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host =3D 1;
 +	return 0;
  }
- 
+=20
  /*
-@@ -3094,36 +3096,6 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
+@@ -3094,36 +3096,6 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu =
+*vcpu)
  }
- 
+=20
  #ifdef CONFIG_KVM_XICS
--static int kvmppc_cpu_notify(struct notifier_block *self, unsigned long action,
+-static int kvmppc_cpu_notify(struct notifier_block *self, unsigned long ac=
+tion,
 -			void *hcpu)
 -{
--	unsigned long cpu = (long)hcpu;
+-	unsigned long cpu =3D (long)hcpu;
 -
 -	switch (action) {
 -	case CPU_UP_PREPARE:
@@ -98,8 +102,8 @@ index 3686471be32b..39ef1f4a7b02 100644
 -	return NOTIFY_OK;
 -}
 -
--static struct notifier_block kvmppc_cpu_notifier = {
--	    .notifier_call = kvmppc_cpu_notify,
+-static struct notifier_block kvmppc_cpu_notifier =3D {
+-	    .notifier_call =3D kvmppc_cpu_notify,
 -};
 -
  /*
@@ -108,7 +112,7 @@ index 3686471be32b..39ef1f4a7b02 100644
 @@ -3185,15 +3157,17 @@ void kvmppc_alloc_host_rm_ops(void)
  		return;
  	}
- 
+=20
 -	register_cpu_notifier(&kvmppc_cpu_notifier);
 -
 +	cpuhp_setup_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE,
@@ -117,7 +121,7 @@ index 3686471be32b..39ef1f4a7b02 100644
 +				  kvmppc_clear_host_core);
  	put_online_cpus();
  }
- 
+=20
  void kvmppc_free_host_rm_ops(void)
  {
  	if (kvmppc_host_rm_ops_hv) {
@@ -125,7 +129,7 @@ index 3686471be32b..39ef1f4a7b02 100644
 +		cpuhp_remove_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE);
  		kfree(kvmppc_host_rm_ops_hv->rm_core);
  		kfree(kvmppc_host_rm_ops_hv);
- 		kvmppc_host_rm_ops_hv = NULL;
+ 		kvmppc_host_rm_ops_hv =3D NULL;
 diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
 index 853f8176594d..71c6822dd5be 100644
 --- a/include/linux/cpuhotplug.h
@@ -138,5 +142,5 @@ index 853f8176594d..71c6822dd5be 100644
  	CPUHP_TIMERS_DEAD,
  	CPUHP_NOTF_ERR_INJ_PREPARE,
  	CPUHP_MIPS_SOC_PREPARE,
--- 
+--=20
 2.10.2
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 65db4c8..efa1acd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -41,7 +41,7 @@
   "\n",
   "Cc: Alexander Graf <agraf\@suse.com>\n",
   "Cc: Paolo Bonzini <pbonzini\@redhat.com>\n",
-  "Cc: \"Radim Kr\304\215m\303\241\305\231\" <rkrcmar\@redhat.com>\n",
+  "Cc: \"Radim Kr=C4=8Dm=C3=A1=C5=99\" <rkrcmar\@redhat.com>\n",
   "Cc: Benjamin Herrenschmidt <benh\@kernel.crashing.org>\n",
   "Cc: Paul Mackerras <paulus\@samba.org>\n",
   "Cc: Michael Ellerman <mpe\@ellerman.id.au>\n",
@@ -51,7 +51,8 @@
   "Signed-off-by: Anna-Maria Gleixner <anna-maria\@linutronix.de>\n",
   "Signed-off-by: Sebastian Andrzej Siewior <bigeasy\@linutronix.de>\n",
   "---\n",
-  " arch/powerpc/kvm/book3s_hv.c | 48 ++++++++++----------------------------------\n",
+  " arch/powerpc/kvm/book3s_hv.c | 48 ++++++++++------------------------------=\n",
+  "----\n",
   " include/linux/cpuhotplug.h   |  1 +\n",
   " 2 files changed, 12 insertions(+), 37 deletions(-)\n",
   "\n",
@@ -59,7 +60,8 @@
   "index 3686471be32b..39ef1f4a7b02 100644\n",
   "--- a/arch/powerpc/kvm/book3s_hv.c\n",
   "+++ b/arch/powerpc/kvm/book3s_hv.c\n",
-  "\@\@ -2254,12 +2254,12 \@\@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master)\n",
+  "\@\@ -2254,12 +2254,12 \@\@ static void post_guest_process(struct kvmppc_vcore =\n",
+  "*vc, bool is_master)\n",
   "  * enter the guest. Only do this if it is the primary thread of the\n",
   "  * core (not if a subcore) that is entering the guest.\n",
   "  */\n",
@@ -67,7 +69,7 @@
   "+static inline int kvmppc_clear_host_core(unsigned int cpu)\n",
   " {\n",
   " \tint core;\n",
-  " \n",
+  "=20\n",
   " \tif (!kvmppc_host_rm_ops_hv || cpu_thread_in_core(cpu))\n",
   "-\t\treturn;\n",
   "+\t\treturn 0;\n",
@@ -76,11 +78,11 @@
   " \t * later in kvmppc_start_thread and we need ensure that state is\n",
   "\@\@ -2267,6 +2267,7 \@\@ static inline void kvmppc_clear_host_core(int cpu)\n",
   " \t */\n",
-  " \tcore = cpu >> threads_shift;\n",
-  " \tkvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host = 0;\n",
+  " \tcore =3D cpu >> threads_shift;\n",
+  " \tkvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host =3D 0;\n",
   "+\treturn 0;\n",
   " }\n",
-  " \n",
+  "=20\n",
   " /*\n",
   "\@\@ -2274,12 +2275,12 \@\@ static inline void kvmppc_clear_host_core(int cpu)\n",
   "  * Only need to do this if it is the primary thread of the core that is\n",
@@ -90,29 +92,31 @@
   "+static inline int kvmppc_set_host_core(unsigned int cpu)\n",
   " {\n",
   " \tint core;\n",
-  " \n",
+  "=20\n",
   " \tif (!kvmppc_host_rm_ops_hv || cpu_thread_in_core(cpu))\n",
   "-\t\treturn;\n",
   "+\t\treturn 0;\n",
-  " \n",
+  "=20\n",
   " \t/*\n",
   " \t * Memory barrier can be omitted here because we do a spin_unlock\n",
   "\@\@ -2287,6 +2288,7 \@\@ static inline void kvmppc_set_host_core(int cpu)\n",
   " \t */\n",
-  " \tcore = cpu >> threads_shift;\n",
-  " \tkvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host = 1;\n",
+  " \tcore =3D cpu >> threads_shift;\n",
+  " \tkvmppc_host_rm_ops_hv->rm_core[core].rm_state.in_host =3D 1;\n",
   "+\treturn 0;\n",
   " }\n",
-  " \n",
+  "=20\n",
   " /*\n",
-  "\@\@ -3094,36 +3096,6 \@\@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)\n",
+  "\@\@ -3094,36 +3096,6 \@\@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu =\n",
+  "*vcpu)\n",
   " }\n",
-  " \n",
+  "=20\n",
   " #ifdef CONFIG_KVM_XICS\n",
-  "-static int kvmppc_cpu_notify(struct notifier_block *self, unsigned long action,\n",
+  "-static int kvmppc_cpu_notify(struct notifier_block *self, unsigned long ac=\n",
+  "tion,\n",
   "-\t\t\tvoid *hcpu)\n",
   "-{\n",
-  "-\tunsigned long cpu = (long)hcpu;\n",
+  "-\tunsigned long cpu =3D (long)hcpu;\n",
   "-\n",
   "-\tswitch (action) {\n",
   "-\tcase CPU_UP_PREPARE:\n",
@@ -135,8 +139,8 @@
   "-\treturn NOTIFY_OK;\n",
   "-}\n",
   "-\n",
-  "-static struct notifier_block kvmppc_cpu_notifier = {\n",
-  "-\t    .notifier_call = kvmppc_cpu_notify,\n",
+  "-static struct notifier_block kvmppc_cpu_notifier =3D {\n",
+  "-\t    .notifier_call =3D kvmppc_cpu_notify,\n",
   "-};\n",
   "-\n",
   " /*\n",
@@ -145,7 +149,7 @@
   "\@\@ -3185,15 +3157,17 \@\@ void kvmppc_alloc_host_rm_ops(void)\n",
   " \t\treturn;\n",
   " \t}\n",
-  " \n",
+  "=20\n",
   "-\tregister_cpu_notifier(&kvmppc_cpu_notifier);\n",
   "-\n",
   "+\tcpuhp_setup_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE,\n",
@@ -154,7 +158,7 @@
   "+\t\t\t\t  kvmppc_clear_host_core);\n",
   " \tput_online_cpus();\n",
   " }\n",
-  " \n",
+  "=20\n",
   " void kvmppc_free_host_rm_ops(void)\n",
   " {\n",
   " \tif (kvmppc_host_rm_ops_hv) {\n",
@@ -162,7 +166,7 @@
   "+\t\tcpuhp_remove_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE);\n",
   " \t\tkfree(kvmppc_host_rm_ops_hv->rm_core);\n",
   " \t\tkfree(kvmppc_host_rm_ops_hv);\n",
-  " \t\tkvmppc_host_rm_ops_hv = NULL;\n",
+  " \t\tkvmppc_host_rm_ops_hv =3D NULL;\n",
   "diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h\n",
   "index 853f8176594d..71c6822dd5be 100644\n",
   "--- a/include/linux/cpuhotplug.h\n",
@@ -175,8 +179,8 @@
   " \tCPUHP_TIMERS_DEAD,\n",
   " \tCPUHP_NOTF_ERR_INJ_PREPARE,\n",
   " \tCPUHP_MIPS_SOC_PREPARE,\n",
-  "-- \n",
+  "--=20\n",
   "2.10.2"
 ]
 
-7fc25f291b1221bf53c81bb9be021b6d0b133f8b254aec6642a0100b86a4be69
+d6c882b7c6dbfa629eb94b896e0b0bd8c4f61c6c85432d2eb703262cfbd0ab7a
