diff for duplicates of <20220628205435.44b0c78c@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 384192e..53bd5c1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -19,8 +19,3 @@ the timer can get scheduled again, no?
 > -
 > -	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
 > -		hrtimer_cancel(&priv->tx_queue[chan].txtimer);
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index adb291c..dc4f61e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -38,11 +38,6 @@
  "> -\tstmmac_disable_all_queues(priv);\n"
  "> -\n"
  "> -\tfor (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)\n"
- "> -\t\thrtimer_cancel(&priv->tx_queue[chan].txtimer);\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ "> -\t\thrtimer_cancel(&priv->tx_queue[chan].txtimer);"
 
-dfb535d522212f7694abc8753a2eb918ae6c1ddfd1ec7591ba36ab087bc396a1
+442e09a88d63fa2a528fbc32a5738948c25567d347ac9dd33559de05e57464cf
