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

diff for duplicates of <899895bc-fb88-a97d-a629-b514ceda296d@canonical.com>

diff --git a/a/1.txt b/N1/1.txt
index 41192d5..332940e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,17 +28,17 @@ On 3/25/20 2:36 PM, Neftin, Sasha wrote:
 >>> +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
 >>> @@ -1240,9 +1240,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct
 >>> e1000_hw *hw, bool force)
->>>             ew32(H2ME, mac_reg);
->>>         }
+>>> ??????????? ew32(H2ME, mac_reg);
+>>> ??????? }
 >>>
->>> -        /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */
->>> +        /* Poll up to 2.5sec for ME to clear ULP_CFG_DONE. */
->>>         while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {
->>> -            if (i++ == 30) {
->>> +            if (i++ == 250) {
->>>                 ret_val = -E1000_ERR_PHY;
->>>                 goto out;
->>>             }
+>>> -??????? /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */
+>>> +??????? /* Poll up to 2.5sec for ME to clear ULP_CFG_DONE. */
+>>> ??????? while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {
+>>> -??????????? if (i++ == 30) {
+>>> +??????????? if (i++ == 250) {
+>>> ??????????????? ret_val = -E1000_ERR_PHY;
+>>> ??????????????? goto out;
+>>> ??????????? }
 >>
 >> The return value was not caught by the caller, so the error ends up
 >> unnoticed.
@@ -67,7 +67,7 @@ Aaron
 > Thanks,
 > Sasha
 >>
->>> -- 
+>>> --?
 >>> 2.17.1
 >>>
 >>
diff --git a/a/content_digest b/N1/content_digest
index 58692b8..c945b10 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,26 +11,13 @@
   "From\0Aaron Ma <aaron.ma\@canonical.com>\0"
 ]
 [
-  "Subject\0Re: [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode\0"
+  "Subject\0[Intel-wired-lan] [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode\0"
 ]
 [
   "Date\0Wed, 25 Mar 2020 14:43:31 +0800\0"
 ]
 [
-  "To\0Neftin",
-  " Sasha <sasha.neftin\@intel.com>",
-  " Kai-Heng Feng <kai.heng.feng\@canonical.com>\0"
-]
-[
-  "Cc\0Kirsher",
-  " Jeffrey T <jeffrey.t.kirsher\@intel.com>",
-  " David Miller <davem\@davemloft.net>",
-  " moderated list:INTEL ETHERNET DRIVERS <intel-wired-lan\@lists.osuosl.org>",
-  " open list:NETWORKING DRIVERS <netdev\@vger.kernel.org>",
-  " open list <linux-kernel\@vger.kernel.org>",
-  " Lifshits",
-  " Vitaly <vitaly.lifshits\@intel.com>",
-  " rex.tsai\@intel.com\0"
+  "To\0intel-wired-lan\@osuosl.org\0"
 ]
 [
   "\0000:1\0"
@@ -69,17 +56,17 @@
   ">>> +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c\n",
   ">>> \@\@ -1240,9 +1240,9 \@\@ static s32 e1000_disable_ulp_lpt_lp(struct\n",
   ">>> e1000_hw *hw, bool force)\n",
-  ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ew32(H2ME, mac_reg);\n",
-  ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240 }\n",
+  ">>> ??????????? ew32(H2ME, mac_reg);\n",
+  ">>> ??????? }\n",
   ">>>\n",
-  ">>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */\n",
-  ">>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 /* Poll up to 2.5sec for ME to clear ULP_CFG_DONE. */\n",
-  ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240 while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {\n",
-  ">>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (i++ == 30) {\n",
-  ">>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (i++ == 250) {\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 ret_val = -E1000_ERR_PHY;\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 goto out;\n",
-  ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 }\n",
+  ">>> -??????? /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */\n",
+  ">>> +??????? /* Poll up to 2.5sec for ME to clear ULP_CFG_DONE. */\n",
+  ">>> ??????? while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {\n",
+  ">>> -??????????? if (i++ == 30) {\n",
+  ">>> +??????????? if (i++ == 250) {\n",
+  ">>> ??????????????? ret_val = -E1000_ERR_PHY;\n",
+  ">>> ??????????????? goto out;\n",
+  ">>> ??????????? }\n",
   ">>\n",
   ">> The return value was not caught by the caller, so the error ends up\n",
   ">> unnoticed.\n",
@@ -108,11 +95,11 @@
   "> Thanks,\n",
   "> Sasha\n",
   ">>\n",
-  ">>> --\302\240\n",
+  ">>> --?\n",
   ">>> 2.17.1\n",
   ">>>\n",
   ">>\n",
   ">"
 ]
 
-e79510eceacc8b0a510e453e389d9506e163b0b647498c238b6d99aca3d304aa
+4fa4f68a8cf1044f2a6e20abef64fa3517de4d1ee9bb16812979ab5ff3222204
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.