diff for duplicates of <1466505306.30123.203.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0b6fdb8..da50c61 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,8 +9,8 @@ On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > Signed-off-by: Qianqian Xie <xieqianqian@huawei.com> > Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com> > --- -> ?drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 +++++- -> ?1 file changed, 5 insertions(+), 1 deletion(-) +> drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 +++++- +> 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c > b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -19,9 +19,9 @@ On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c > @@ -271,7 +271,11 @@ static void hns_dsaf_ge_srst_by_port(struct > dsaf_device *dsaf_dev, u32 port, -> ? } -> ? } else { -> ? reg_val_1 = 0x15540 << dsaf_dev->reset_offset; +> } +> } else { +> reg_val_1 = 0x15540 << dsaf_dev->reset_offset; > - reg_val_2 = 0x100 << dsaf_dev->reset_offset; > + > + if (AE_IS_VER1(dsaf_dev->dsaf_ver)) @@ -30,16 +30,16 @@ On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > + reg_val_2 = 0x40 << dsaf_dev->reset_offset; reg_val_1 = 0x15540; -reg_val_2 =?AE_IS_VER1(dsaf_dev->dsaf_ver) ? 0x100 : 0x40; +reg_val_2 = AE_IS_VER1(dsaf_dev->dsaf_ver) ? 0x100 : 0x40; -reg_val_1 <<=?dsaf_dev->reset_offset; -reg_val_2 <<=?dsaf_dev- +reg_val_1 <<= dsaf_dev->reset_offset; +reg_val_2 <<= dsaf_dev- >reset_offset; -> ? -> ? if (!dereset) { -> ? dsaf_write_sub(dsaf_dev, +> +> if (!dereset) { +> dsaf_write_sub(dsaf_dev, > DSAF_SUB_SC_GE_RESET_REQ1_REG, -- diff --git a/a/content_digest b/N1/content_digest index 5b92ffe..5d3588b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,24 @@ "ref\01466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com\0" "ref\01466481399-70080-2-git-send-email-Yisen.Zhuang@huawei.com\0" - "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" - "Subject\0[PATCH net-next 01/19] net: hns: bug fix of ge reset sequence\0" + "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" + "Subject\0Re: [PATCH net-next 01/19] net: hns: bug fix of ge reset sequence\0" "Date\0Tue, 21 Jun 2016 13:35:06 +0300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Yisen 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 Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote:\n" @@ -17,8 +32,8 @@ "> Signed-off-by: Qianqian Xie <xieqianqian@huawei.com>\n" "> Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>\n" "> ---\n" - "> ?drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 +++++-\n" - "> ?1 file changed, 5 insertions(+), 1 deletion(-)\n" + "> \302\240drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 +++++-\n" + "> \302\2401 file changed, 5 insertions(+), 1 deletion(-)\n" "> \n" "> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c\n" "> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c\n" @@ -27,9 +42,9 @@ "> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c\n" "> @@ -271,7 +271,11 @@ static void hns_dsaf_ge_srst_by_port(struct\n" "> dsaf_device *dsaf_dev, u32 port,\n" - "> ?\t\t}\n" - "> ?\t} else {\n" - "> ?\t\treg_val_1 = 0x15540 << dsaf_dev->reset_offset;\n" + "> \302\240\t\t}\n" + "> \302\240\t} else {\n" + "> \302\240\t\treg_val_1 = 0x15540 << dsaf_dev->reset_offset;\n" "> -\t\treg_val_2 = 0x100 << dsaf_dev->reset_offset;\n" "> +\n" "> +\t\tif (AE_IS_VER1(dsaf_dev->dsaf_ver))\n" @@ -38,16 +53,16 @@ "> +\t\t\treg_val_2 = 0x40 << dsaf_dev->reset_offset;\n" "\n" "reg_val_1 = 0x15540;\n" - "reg_val_2 =?AE_IS_VER1(dsaf_dev->dsaf_ver) ? 0x100 : 0x40;\n" + "reg_val_2 =\302\240AE_IS_VER1(dsaf_dev->dsaf_ver) ? 0x100 : 0x40;\n" "\n" - "reg_val_1 <<=?dsaf_dev->reset_offset;\n" - "reg_val_2 <<=?dsaf_dev-\n" + "reg_val_1 <<=\302\240dsaf_dev->reset_offset;\n" + "reg_val_2 <<=\302\240dsaf_dev-\n" ">reset_offset;\n" "\n" "\n" - "> ?\n" - "> ?\t\tif (!dereset) {\n" - "> ?\t\t\tdsaf_write_sub(dsaf_dev,\n" + "> \302\240\n" + "> \302\240\t\tif (!dereset) {\n" + "> \302\240\t\t\tdsaf_write_sub(dsaf_dev,\n" "> DSAF_SUB_SC_GE_RESET_REQ1_REG,\n" "\n" "-- \n" @@ -55,4 +70,4 @@ "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -45c00f18a99f1489d9d51f325d438c097e65772e7b621c71e77682af158d2d48 +ececdc2ff6303aaa3d7c44708ac6572addf917461eb5ae0d210cc4bd56edc76e
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.