diff for duplicates of <1455015744.3592.46.camel@intel.com>

diff --git a/a/1.txt b/N1/1.txt
index bfb6afc..764656a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,49 +1,49 @@
 On Fri, 2016-01-29 at 23:11 +0100, John Holland wrote:
 > The Intel i211 LOM pcie ethernet controllers' iNVM operates as an
-> OTP?
-> and has no externel EEPROM interface [1]. The following allows the?
+> OTP 
+> and has no externel EEPROM interface [1]. The following allows the 
 > driver to pickup the MAC address from a device tree blob when
-> CONFIG_OF?
+> CONFIG_OF 
 > has been enabled.
 > 
-> [1]?
+> [1] 
 > http://www.intel.com/content/www/us/en/embedded/products/networking/i
 > 211-ethernet-controller-datasheet.html
 > 
 > Signed-off-by: John Holland <jotihojr@gmail.com>
 > ---
-> ? drivers/net/ethernet/intel/igb/igb_main.c | 30?
+>   drivers/net/ethernet/intel/igb/igb_main.c | 30 
 > ++++++++++++++++++++++++++++++
-> ? 1 file changed, 30 insertions(+)
+>   1 file changed, 30 insertions(+)
 > 
-> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c?
+> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c 
 > b/drivers/net/ethernet/intel/igb/igb_main.c
 > index 31e5f39..9c92443 100644
 > --- a/drivers/net/ethernet/intel/igb/igb_main.c
 > +++ b/drivers/net/ethernet/intel/igb/igb_main.c
 > @@ -56,6 +56,11 @@
-> ? #include <linux/i2c.h>
-> ? #include "igb.h"
+>   #include <linux/i2c.h>
+>   #include "igb.h"
 > 
 > +#ifdef defined(CONFIG_OF)
 > +#include <linux/of_net.h>
 > +#include <linux/etherdevice.h>
 > +#endif
 > +
-> ? #define MAJ 5
-> ? #define MIN 3
-> ? #define BUILD 0
+>   #define MAJ 5
+>   #define MIN 3
+>   #define BUILD 0
 > @@ -2217,6 +2222,26 @@ static s32 igb_init_i2c(struct igb_adapter
 > *adapter)
-> ? }
+>   }
 > 
-> ? /**
-> + *??igb_read_mac_addr_dts - Read mac addres from the device tree
+>   /**
+> + *  igb_read_mac_addr_dts - Read mac addres from the device tree
 > blob.
 
 Address is mis-spelled above
 
-> + *??@hw: pointer to the e1000 hardware structure
+> + *  @hw: pointer to the e1000 hardware structure
 > + **/
 > +#ifdef defined(CONFIG_OF)
 
@@ -52,45 +52,38 @@ the #ifdef as well.
 
 > +static void igb_read_mac_addr_dts(struct e1000_hw *hw)
 > +{
-> +???????const u8 *mac;
-> +???????struct device_node *dn;
+> +       const u8 *mac;
+> +       struct device_node *dn;
 > +
-> +???????dn = of_find_compatible_node(NULL, NULL, "intel,i211");
-> +???????if (!dn)
-> +???????????????return;
+> +       dn = of_find_compatible_node(NULL, NULL, "intel,i211");
+> +       if (!dn)
+> +               return;
 > +
-> +???????mac = of_get_mac_address(dn);
-> +???????if (mac)
-> +???????????????ether_addr_copy(hw->mac.addr, mac);
+> +       mac = of_get_mac_address(dn);
+> +       if (mac)
+> +               ether_addr_copy(hw->mac.addr, mac);
 > +}
 > +#endif
 > +
 > +/**
-> ???*??igb_probe - Device Initialization Routine
-> ???*??@pdev: PCI device information struct
-> ???*??@ent: entry in igb_pci_tbl
+>    *  igb_probe - Device Initialization Routine
+>    *  @pdev: PCI device information struct
+>    *  @ent: entry in igb_pci_tbl
 > @@ -2420,6 +2445,11 @@ static int igb_probe(struct pci_dev *pdev,
-> const?
+> const 
 > struct pci_device_id *ent)
-> ?????????if (hw->mac.ops.read_mac_addr(hw))
-> ?????????????????dev_err(&pdev->dev, "NVM Read Error\n");
+>          if (hw->mac.ops.read_mac_addr(hw))
+>                  dev_err(&pdev->dev, "NVM Read Error\n");
 > 
 > +#ifdef defined(CONFIG_OF)
-> +???????if (!is_valid_ether_addr(hw->mac.addr))
-> +???????????????igb_read_mac_addr_dts(hw);
+> +       if (!is_valid_ether_addr(hw->mac.addr))
+> +               igb_read_mac_addr_dts(hw);
 > +#endif
 > +
-> ?????????memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);
+>          memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);
 > 
-> ?????????if (!is_valid_ether_addr(netdev->dev_addr)) {
+>          if (!is_valid_ether_addr(netdev->dev_addr)) {
 > _______________________________________________
 > Intel-wired-lan mailing list
-> Intel-wired-lan at lists.osuosl.org
+> Intel-wired-lan@lists.osuosl.org
 > http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: signature.asc
-Type: application/pgp-signature
-Size: 819 bytes
-Desc: This is a digitally signed message part
-URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20160209/9680d9a7/attachment.asc>
diff --git a/N1/2.bin b/N1/2.bin
new file mode 100644
index 0000000..1753e73
--- /dev/null
+++ b/N1/2.bin
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJWucdAAAoJEOVv75VaS+3OU5cP/RrGt3Qgmwx53isDsvr3jkb/
+7HhbM9KWwubT09nP/n/2pf7h2I5aRr9vuWkHXTaUAFOC/aYPD9L0mgfKCCxCv1/K
+BFkA1HZSFhYFXPM7L9O3S2Vj3ia6zBpOY8dx7WwnRzc+5jQgZrhkC+lw7Jo+Zzlv
+P21tdHQSW3EZPRY7MKjcECZNd4tJJLbgvdMBVuh7yFvanlwO8/P6WwwJ/SFO/Drd
+pPzvXeeSk3f88tprN4ktEwIqVwhM4VYbnyciO7vzfUiT0JMuVDgVLKwrpxN1gX4W
+YqXEmwNYot8rRM9bLKiplRhhfzY44B9rPPkQmQMO7JtSG7FF9Itb3xT++O/US/4+
+AloSbLSgPGWZT8UCWvPmPuV7oJgLvmaztpq6KOAfehrNpJvivg8vgscHmjVbwOL9
+m+8j/rpQ0fCTC4kUT1fPGUZmxI0uGzZUeptbIZxGC3oS84i9fk3opqFhn980Bfsh
+hY6IgKeQXFoW6pF/gXpckpUQM+LKVAJfM6+OP2UVxpDKbllBLE0FEznuSBen7Q2n
+RxWKHrNRkQGFdh6DE62eyQOJ7VgCOaq2W0o8io9EZIvh/0eJLVO0zggVu3KcdMCA
+Ock3B41yKL9xQHUKcxi9gKpD6SO8mwC81ph71VUqLnjZtveemE+r+7aws2xT/67R
+V3OZUi+zFQ+0N6ujwz7d
+=iWpA
+-----END PGP SIGNATURE-----
diff --git a/N1/2.hdr b/N1/2.hdr
new file mode 100644
index 0000000..da6d245
--- /dev/null
+++ b/N1/2.hdr
@@ -0,0 +1,3 @@
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part
+Content-Transfer-Encoding: 7bit
diff --git a/a/content_digest b/N1/content_digest
index 0dde9d7..19c2ff2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,56 +1,58 @@
  "ref\056ABE3A8.4010602@gmail.com\0"
  "From\0Jeff Kirsher <jeffrey.t.kirsher@intel.com>\0"
- "Subject\0[Intel-wired-lan] [next] igb: allow setting MAC address on i211 using a device tree blob\0"
+ "Subject\0Re: [Intel-wired-lan] [next] igb: allow setting MAC address on i211 using a device tree blob\0"
  "Date\0Tue, 09 Feb 2016 12:02:24 +0100\0"
- "To\0intel-wired-lan@osuosl.org\0"
- "\00:1\0"
+ "To\0John Holland <jotihojr@gmail.com>"
+  intel-wired-lan@lists.osuosl.org
+ " netdev@vger.kernel.org\0"
+ "\01:1\0"
  "b\0"
  "On Fri, 2016-01-29 at 23:11 +0100, John Holland wrote:\n"
  "> The Intel i211 LOM pcie ethernet controllers' iNVM operates as an\n"
- "> OTP?\n"
- "> and has no externel EEPROM interface [1]. The following allows the?\n"
+ "> OTP\302\240\n"
+ "> and has no externel EEPROM interface [1]. The following allows the\302\240\n"
  "> driver to pickup the MAC address from a device tree blob when\n"
- "> CONFIG_OF?\n"
+ "> CONFIG_OF\302\240\n"
  "> has been enabled.\n"
  "> \n"
- "> [1]?\n"
+ "> [1]\302\240\n"
  "> http://www.intel.com/content/www/us/en/embedded/products/networking/i\n"
  "> 211-ethernet-controller-datasheet.html\n"
  "> \n"
  "> Signed-off-by: John Holland <jotihojr@gmail.com>\n"
  "> ---\n"
- "> ? drivers/net/ethernet/intel/igb/igb_main.c | 30?\n"
+ "> \302\240 drivers/net/ethernet/intel/igb/igb_main.c | 30\302\240\n"
  "> ++++++++++++++++++++++++++++++\n"
- "> ? 1 file changed, 30 insertions(+)\n"
+ "> \302\240 1 file changed, 30 insertions(+)\n"
  "> \n"
- "> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c?\n"
+ "> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c\302\240\n"
  "> b/drivers/net/ethernet/intel/igb/igb_main.c\n"
  "> index 31e5f39..9c92443 100644\n"
  "> --- a/drivers/net/ethernet/intel/igb/igb_main.c\n"
  "> +++ b/drivers/net/ethernet/intel/igb/igb_main.c\n"
  "> @@ -56,6 +56,11 @@\n"
- "> ? #include <linux/i2c.h>\n"
- "> ? #include \"igb.h\"\n"
+ "> \302\240 #include <linux/i2c.h>\n"
+ "> \302\240 #include \"igb.h\"\n"
  "> \n"
  "> +#ifdef defined(CONFIG_OF)\n"
  "> +#include <linux/of_net.h>\n"
  "> +#include <linux/etherdevice.h>\n"
  "> +#endif\n"
  "> +\n"
- "> ? #define MAJ 5\n"
- "> ? #define MIN 3\n"
- "> ? #define BUILD 0\n"
+ "> \302\240 #define MAJ 5\n"
+ "> \302\240 #define MIN 3\n"
+ "> \302\240 #define BUILD 0\n"
  "> @@ -2217,6 +2222,26 @@ static s32 igb_init_i2c(struct igb_adapter\n"
  "> *adapter)\n"
- "> ? }\n"
+ "> \302\240 }\n"
  "> \n"
- "> ? /**\n"
- "> + *??igb_read_mac_addr_dts - Read mac addres from the device tree\n"
+ "> \302\240 /**\n"
+ "> + *\302\240\302\240igb_read_mac_addr_dts - Read mac addres from the device tree\n"
  "> blob.\n"
  "\n"
  "Address is mis-spelled above\n"
  "\n"
- "> + *??@hw: pointer to the e1000 hardware structure\n"
+ "> + *\302\240\302\240@hw: pointer to the e1000 hardware structure\n"
  "> + **/\n"
  "> +#ifdef defined(CONFIG_OF)\n"
  "\n"
@@ -59,47 +61,61 @@
  "\n"
  "> +static void igb_read_mac_addr_dts(struct e1000_hw *hw)\n"
  "> +{\n"
- "> +???????const u8 *mac;\n"
- "> +???????struct device_node *dn;\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240const u8 *mac;\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct device_node *dn;\n"
  "> +\n"
- "> +???????dn = of_find_compatible_node(NULL, NULL, \"intel,i211\");\n"
- "> +???????if (!dn)\n"
- "> +???????????????return;\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240dn = of_find_compatible_node(NULL, NULL, \"intel,i211\");\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!dn)\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return;\n"
  "> +\n"
- "> +???????mac = of_get_mac_address(dn);\n"
- "> +???????if (mac)\n"
- "> +???????????????ether_addr_copy(hw->mac.addr, mac);\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240mac = of_get_mac_address(dn);\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (mac)\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240ether_addr_copy(hw->mac.addr, mac);\n"
  "> +}\n"
  "> +#endif\n"
  "> +\n"
  "> +/**\n"
- "> ???*??igb_probe - Device Initialization Routine\n"
- "> ???*??@pdev: PCI device information struct\n"
- "> ???*??@ent: entry in igb_pci_tbl\n"
+ "> \302\240\302\240\302\240*\302\240\302\240igb_probe - Device Initialization Routine\n"
+ "> \302\240\302\240\302\240*\302\240\302\240@pdev: PCI device information struct\n"
+ "> \302\240\302\240\302\240*\302\240\302\240@ent: entry in igb_pci_tbl\n"
  "> @@ -2420,6 +2445,11 @@ static int igb_probe(struct pci_dev *pdev,\n"
- "> const?\n"
+ "> const\302\240\n"
  "> struct pci_device_id *ent)\n"
- "> ?????????if (hw->mac.ops.read_mac_addr(hw))\n"
- "> ?????????????????dev_err(&pdev->dev, \"NVM Read Error\\n\");\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (hw->mac.ops.read_mac_addr(hw))\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240dev_err(&pdev->dev, \"NVM Read Error\\n\");\n"
  "> \n"
  "> +#ifdef defined(CONFIG_OF)\n"
- "> +???????if (!is_valid_ether_addr(hw->mac.addr))\n"
- "> +???????????????igb_read_mac_addr_dts(hw);\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!is_valid_ether_addr(hw->mac.addr))\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240igb_read_mac_addr_dts(hw);\n"
  "> +#endif\n"
  "> +\n"
- "> ?????????memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);\n"
  "> \n"
- "> ?????????if (!is_valid_ether_addr(netdev->dev_addr)) {\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!is_valid_ether_addr(netdev->dev_addr)) {\n"
  "> _______________________________________________\n"
  "> Intel-wired-lan mailing list\n"
- "> Intel-wired-lan at lists.osuosl.org\n"
- "> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: signature.asc\n"
- "Type: application/pgp-signature\n"
- "Size: 819 bytes\n"
- "Desc: This is a digitally signed message part\n"
- URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20160209/9680d9a7/attachment.asc>
+ "> Intel-wired-lan@lists.osuosl.org\n"
+ > http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
+ "\01:2\0"
+ "fn\0signature.asc\0"
+ "d\0This is a digitally signed message part\0"
+ "b\0"
+ "-----BEGIN PGP SIGNATURE-----\n"
+ "Version: GnuPG v1\n"
+ "\n"
+ "iQIcBAABCgAGBQJWucdAAAoJEOVv75VaS+3OU5cP/RrGt3Qgmwx53isDsvr3jkb/\n"
+ "7HhbM9KWwubT09nP/n/2pf7h2I5aRr9vuWkHXTaUAFOC/aYPD9L0mgfKCCxCv1/K\n"
+ "BFkA1HZSFhYFXPM7L9O3S2Vj3ia6zBpOY8dx7WwnRzc+5jQgZrhkC+lw7Jo+Zzlv\n"
+ "P21tdHQSW3EZPRY7MKjcECZNd4tJJLbgvdMBVuh7yFvanlwO8/P6WwwJ/SFO/Drd\n"
+ "pPzvXeeSk3f88tprN4ktEwIqVwhM4VYbnyciO7vzfUiT0JMuVDgVLKwrpxN1gX4W\n"
+ "YqXEmwNYot8rRM9bLKiplRhhfzY44B9rPPkQmQMO7JtSG7FF9Itb3xT++O/US/4+\n"
+ "AloSbLSgPGWZT8UCWvPmPuV7oJgLvmaztpq6KOAfehrNpJvivg8vgscHmjVbwOL9\n"
+ "m+8j/rpQ0fCTC4kUT1fPGUZmxI0uGzZUeptbIZxGC3oS84i9fk3opqFhn980Bfsh\n"
+ "hY6IgKeQXFoW6pF/gXpckpUQM+LKVAJfM6+OP2UVxpDKbllBLE0FEznuSBen7Q2n\n"
+ "RxWKHrNRkQGFdh6DE62eyQOJ7VgCOaq2W0o8io9EZIvh/0eJLVO0zggVu3KcdMCA\n"
+ "Ock3B41yKL9xQHUKcxi9gKpD6SO8mwC81ph71VUqLnjZtveemE+r+7aws2xT/67R\n"
+ "V3OZUi+zFQ+0N6ujwz7d\n"
+ "=iWpA\n"
+ "-----END PGP SIGNATURE-----\n"
 
-b2b140eae6df50251fdb02a858f386ec8898133616f8f85e2a4555d62568debf
+72da8a1408cc5321f4d0350dd6f0d25fbaa4c411fc919fc1db968ba680e6e892
