All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20260306194328.238d89ff@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index ee5f3df..eccb104 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,3 +25,9 @@ hint: If you prefer to skip this patch, run "git am --skip" instead.
 hint: To restore the original branch and stop patching, run "git am --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
 Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties
+
+
+_______________________________________________
+linux-amlogic mailing list
+linux-amlogic@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-amlogic
diff --git a/a/content_digest b/N1/content_digest
index 77c83a8..76864d5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -106,6 +106,12 @@
  "hint: If you prefer to skip this patch, run \"git am --skip\" instead.\n"
  "hint: To restore the original branch and stop patching, run \"git am --abort\".\n"
  "hint: Disable this message with \"git config set advice.mergeConflict false\"\n"
- Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties
+ "Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-amlogic mailing list\n"
+ "linux-amlogic@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-amlogic
 
-61c0459796ef69af65e598f9d69557ce1f5694cbf4fda9b249b0a6965d371346
+25662b5d78baccba7641c0f2ce141a8d752463f01ed1ff195999bcc919970a3e

diff --git a/a/1.txt b/N2/1.txt
index ee5f3df..348af46 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -25,3 +25,9 @@ hint: If you prefer to skip this patch, run "git am --skip" instead.
 hint: To restore the original branch and stop patching, run "git am --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
 Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties
+
+
+_______________________________________________
+linux-riscv mailing list
+linux-riscv@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/a/content_digest b/N2/content_digest
index 77c83a8..a90306b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -106,6 +106,12 @@
  "hint: If you prefer to skip this patch, run \"git am --skip\" instead.\n"
  "hint: To restore the original branch and stop patching, run \"git am --abort\".\n"
  "hint: Disable this message with \"git config set advice.mergeConflict false\"\n"
- Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties
+ "Patch failed at 0002 net: stmmac: qcom-ethqos: use generic device properties\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-riscv mailing list\n"
+ "linux-riscv@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-riscv
 
-61c0459796ef69af65e598f9d69557ce1f5694cbf4fda9b249b0a6965d371346
+297bdd445042d60ccf43576e557de9df56c66c0338da68a8cb579c09a04689c5

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.