diff for duplicates of <1467029338.1847.106.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index e223334..fb76854 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,29 +15,29 @@ On Mon, 2016-06-27 at 15:00 +0300, Andy Shevchenko wrote: > > > > > > @@ -2567,15 +2567,15 @@ static char > > > *hns_dsaf_get_node_stats_strings(char *data, int node, -> > > ? buff += ETH_GSTRING_LEN; -> > > ? if (node < DSAF_SERVICE_NW_NUM && !is_ver1) { -> > > ? for (i = 0; i < DSAF_PRIO_NR; i++) { +> > > buff += ETH_GSTRING_LEN; +> > > if (node < DSAF_SERVICE_NW_NUM && !is_ver1) { +> > > for (i = 0; i < DSAF_PRIO_NR; i++) { > > > - snprintf(buff, ETH_GSTRING_LEN, -> > > - ?"inod%d_pfc_prio%d_pkts", node, +> > > - "inod%d_pfc_prio%d_pkts", node, > > > i); > > > - buff += ETH_GSTRING_LEN; > > > - } > > > - for (i = 0; i < DSAF_PRIO_NR; i++) { > > > - snprintf(buff, ETH_GSTRING_LEN, -> > > - ?"onod%d_pfc_prio%d_pkts", node, +> > > - "onod%d_pfc_prio%d_pkts", node, > > > i); > > > + snprintf(buff + 0 * ETH_GSTRING_LEN * > > > DSAF_PRIO_NR, -> > > + ?ETH_GSTRING_LEN, +> > > + ETH_GSTRING_LEN, > > > "inod%d_pfc_prio%d_pkts", -> > > + ?node, i); +> > > + node, i); > > > + snprintf(buff + 1 * ETH_GSTRING_LEN * > > > DSAF_PRIO_NR, -> > > + ?ETH_GSTRING_LEN, +> > > + ETH_GSTRING_LEN, > > > "onod%d_pfc_prio%d_pkts", -> > > + ?node, i); -> > > ? buff += ETH_GSTRING_LEN; +> > > + node, i); +> > > buff += ETH_GSTRING_LEN; > > This looks odd and likely incorrect. > Why? the idea is to print stats for Rx and Tx at once. > diff --git a/a/content_digest b/N1/content_digest index 8c70198..c526aa4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,26 @@ "ref\01467021255-95900-7-git-send-email-Yisen.Zhuang@huawei.com\0" "ref\01467028161.1847.101.camel@perches.com\0" "ref\01467028835.30123.287.camel@linux.intel.com\0" - "From\0joe@perches.com (Joe Perches)\0" - "Subject\0[PATCH net-next 6/9] net: hns: normalize two different loop\0" + "From\0Joe Perches <joe@perches.com>\0" + "Subject\0Re: [PATCH net-next 6/9] net: hns: normalize two different loop\0" "Date\0Mon, 27 Jun 2016 05:08:58 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>" + Yisen Zhuang <Yisen.Zhuang@huawei.com> + davem@davemloft.net + salil.mehta@huawei.com + " yankejian@huawei.com\0" + "Cc\0liguozhu@huawei.com" + huangdaode@hisilicon.com + arnd@arndb.de + andrew@lunn.ch + geliangtang@163.com + ivecera@redhat.com + fengguang.wu@intel.com + charles.chenxin@huawei.com + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linuxarm@huawei.com\0" "\00:1\0" "b\0" "On Mon, 2016-06-27 at 15:00 +0300, Andy Shevchenko wrote:\n" @@ -25,29 +41,29 @@ "> > > \n" "> > > @@ -2567,15 +2567,15 @@ static char\n" "> > > *hns_dsaf_get_node_stats_strings(char *data, int node,\n" - "> > > ?\tbuff += ETH_GSTRING_LEN;\n" - "> > > ?\tif (node < DSAF_SERVICE_NW_NUM && !is_ver1) {\n" - "> > > ?\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" + "> > > \302\240\tbuff += ETH_GSTRING_LEN;\n" + "> > > \302\240\tif (node < DSAF_SERVICE_NW_NUM && !is_ver1) {\n" + "> > > \302\240\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" "> > > -\t\t\tsnprintf(buff, ETH_GSTRING_LEN,\n" - "> > > -\t\t\t\t?\"inod%d_pfc_prio%d_pkts\", node,\n" + "> > > -\t\t\t\t\302\240\"inod%d_pfc_prio%d_pkts\", node,\n" "> > > i);\n" "> > > -\t\t\tbuff += ETH_GSTRING_LEN;\n" "> > > -\t\t}\n" "> > > -\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" "> > > -\t\t\tsnprintf(buff, ETH_GSTRING_LEN,\n" - "> > > -\t\t\t\t?\"onod%d_pfc_prio%d_pkts\", node,\n" + "> > > -\t\t\t\t\302\240\"onod%d_pfc_prio%d_pkts\", node,\n" "> > > i);\n" "> > > +\t\t\tsnprintf(buff + 0 * ETH_GSTRING_LEN *\n" "> > > DSAF_PRIO_NR,\n" - "> > > +\t\t\t\t?ETH_GSTRING_LEN,\n" + "> > > +\t\t\t\t\302\240ETH_GSTRING_LEN,\n" "> > > \"inod%d_pfc_prio%d_pkts\",\n" - "> > > +\t\t\t\t?node, i);\n" + "> > > +\t\t\t\t\302\240node, i);\n" "> > > +\t\t\tsnprintf(buff + 1 * ETH_GSTRING_LEN *\n" "> > > DSAF_PRIO_NR,\n" - "> > > +\t\t\t\t?ETH_GSTRING_LEN,\n" + "> > > +\t\t\t\t\302\240ETH_GSTRING_LEN,\n" "> > > \"onod%d_pfc_prio%d_pkts\",\n" - "> > > +\t\t\t\t?node, i);\n" - "> > > ?\t\t\tbuff += ETH_GSTRING_LEN;\n" + "> > > +\t\t\t\t\302\240node, i);\n" + "> > > \302\240\t\t\tbuff += ETH_GSTRING_LEN;\n" "> > This looks odd and likely incorrect.\n" "> Why? the idea is to print stats for Rx and Tx at once.\n" "> \n" @@ -59,4 +75,4 @@ "If it's a bug fix, then it should likely be added\n" to the stable trees. -c481c144c806813be3b51f333e7cc2d662ffa6f3fca7098a0e901732bdf0d95f +448f747c89383944f91e6bf293522e0fbf7a548543cf978915567dade8899d69
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.