diff for duplicates of <20211115165443.371123535@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index bd0f00c..6d0c185 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,22 +9,22 @@ instead for UML builds.
 
 Prevents this build error on UML:
 
-../drivers/net/ethernet/intel/igc/igc_ptp.c: In function ?igc_device_tstamp_to_system?:
-../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: implicit declaration of function ?convert_art_ns_to_tsc? [-Werror=implicit-function-declaration]
+../drivers/net/ethernet/intel/igc/igc_ptp.c: In function ‘igc_device_tstamp_to_system’:
+../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: implicit declaration of function ‘convert_art_ns_to_tsc’ [-Werror=implicit-function-declaration]
   return convert_art_ns_to_tsc(tstamp);
-../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: incompatible types when returning type ?int? but ?struct system_counterval_t? was expected
+../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: incompatible types when returning type ‘int’ but ‘struct system_counterval_t’ was expected
   return convert_art_ns_to_tsc(tstamp);
 
 Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
 Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
-Cc: linux-um at lists.infradead.org
+Cc: linux-um@lists.infradead.org
 Cc: Jeff Dike <jdike@addtoit.com>
 Cc: Richard Weinberger <richard@nod.at>
 Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
 Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
 Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
-Cc: intel-wired-lan at lists.osuosl.org
-Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap at infradead.org
+Cc: intel-wired-lan@lists.osuosl.org
+Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap@infradead.org
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
@@ -46,3 +46,11 @@ index 0f021909b430a..30568e3544cda 100644
  	return (struct system_counterval_t) { };
 -- 
 2.33.0
+
+
+
+
+_______________________________________________
+linux-um mailing list
+linux-um@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-um
diff --git a/a/content_digest b/N1/content_digest
index 30c705d..b9ef5ef 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,20 @@
  "ref\020211115165428.722074685@linuxfoundation.org\0"
  "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0"
- "Subject\0[Intel-wired-lan] [PATCH 5.15 430/917] net: intel: igc_ptp: fix build for UML\0"
+ "Subject\0[PATCH 5.15 430/917] net: intel: igc_ptp: fix build for UML\0"
  "Date\0Mon, 15 Nov 2021 17:58:45 +0100\0"
- "To\0intel-wired-lan@osuosl.org\0"
+ "To\0linux-kernel@vger.kernel.org\0"
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
+  stable@vger.kernel.org
+  Randy Dunlap <rdunlap@infradead.org>
+  linux-um@lists.infradead.org
+  Jeff Dike <jdike@addtoit.com>
+  Richard Weinberger <richard@nod.at>
+  Anton Ivanov <anton.ivanov@cambridgegreys.com>
+  Jesse Brandeburg <jesse.brandeburg@intel.com>
+  Tony Nguyen <anthony.l.nguyen@intel.com>
+  intel-wired-lan@lists.osuosl.org
+  Jakub Kicinski <kuba@kernel.org>
+ " Sasha Levin <sashal@kernel.org>\0"
  "\00:1\0"
  "b\0"
  "From: Randy Dunlap <rdunlap@infradead.org>\n"
@@ -16,22 +28,22 @@
  "\n"
  "Prevents this build error on UML:\n"
  "\n"
- "../drivers/net/ethernet/intel/igc/igc_ptp.c: In function ?igc_device_tstamp_to_system?:\n"
- "../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: implicit declaration of function ?convert_art_ns_to_tsc? [-Werror=implicit-function-declaration]\n"
+ "../drivers/net/ethernet/intel/igc/igc_ptp.c: In function \342\200\230igc_device_tstamp_to_system\342\200\231:\n"
+ "../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: implicit declaration of function \342\200\230convert_art_ns_to_tsc\342\200\231 [-Werror=implicit-function-declaration]\n"
  "  return convert_art_ns_to_tsc(tstamp);\n"
- "../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: incompatible types when returning type ?int? but ?struct system_counterval_t? was expected\n"
+ "../drivers/net/ethernet/intel/igc/igc_ptp.c:777:9: error: incompatible types when returning type \342\200\230int\342\200\231 but \342\200\230struct system_counterval_t\342\200\231 was expected\n"
  "  return convert_art_ns_to_tsc(tstamp);\n"
  "\n"
  "Fixes: 68f5d3f3b654 (\"um: add PCI over virtio emulation driver\")\n"
  "Signed-off-by: Randy Dunlap <rdunlap@infradead.org>\n"
- "Cc: linux-um at lists.infradead.org\n"
+ "Cc: linux-um@lists.infradead.org\n"
  "Cc: Jeff Dike <jdike@addtoit.com>\n"
  "Cc: Richard Weinberger <richard@nod.at>\n"
  "Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>\n"
  "Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>\n"
  "Cc: Tony Nguyen <anthony.l.nguyen@intel.com>\n"
- "Cc: intel-wired-lan at lists.osuosl.org\n"
- "Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap at infradead.org\n"
+ "Cc: intel-wired-lan@lists.osuosl.org\n"
+ "Link: https://lore.kernel.org/r/20211014050516.6846-1-rdunlap@infradead.org\n"
  "Signed-off-by: Jakub Kicinski <kuba@kernel.org>\n"
  "Signed-off-by: Sasha Levin <sashal@kernel.org>\n"
  "---\n"
@@ -52,6 +64,14 @@
  " #else\n"
  " \treturn (struct system_counterval_t) { };\n"
  "-- \n"
- 2.33.0
+ "2.33.0\n"
+ "\n"
+ "\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-um mailing list\n"
+ "linux-um@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-um
 
-3c0bc1566a917e1fcfd391b2fbc39e52813f8ff8e012d275bab577171ba39ae5
+6caea64bf98a32e17a2dca2fcc2680a4ee53f6c4009434c1fee7dd15e6f3d0d0
