| Message ID | 20191226065145.32752-1-ike.pan@canonical.com |
|---|---|
| Headers | show |
| Series | Several Hisilicon SAS Host fixes | expand |
The patches cherry-picked for eoan can not be applied on bionic due to some difference in +/- 3 lines. 3 branches for B/D/E are ready for pull these 4 patches at git://kernel.ubuntu.com/ikepanhc/public.git lp1853992-eoan git://kernel.ubuntu.com/ikepanhc/public.git lp1853992-disco git://kernel.ubuntu.com/ikepanhc/public.git lp1853992-bionic for your convenient
On 2019-12-26 07:51, Ike Panhc wrote: > BugLink: https://launchpad.net/bugs/1853992 > BugLink: https://launchpad.net/bugs/1853995 > BugLink: https://launchpad.net/bugs/1853997 > BugLink: https://launchpad.net/bugs/1855952 > > We have several fixes for Hisilicon SAS host driver and they are clean > cherry-picked from upstream kernel. > > Patch 1 and 4 are potential NULL pointer dereference fix > Patch 2 is recover device fix > Patch 3 fixes that some SSD can not use > > All changes limit in Hisilicon SAS driver so there is lowest regression > risk for other platform/driver. > > Luo Jiaxing (1): > scsi: hisi_sas: Fix out of bound at debug_I_T_nexus_reset() > > Xiang Chen (3): > scsi: hisi_sas: Check sas_port before using it > scsi: hisi_sas: Fix the conflict between device gone and host reset > scsi: hisi_sas: Assign NCQ tag for all NCQ commands > > drivers/scsi/hisi_sas/hisi_sas.h | 1 - > drivers/scsi/hisi_sas/hisi_sas_main.c | 36 ++++++++++---------------- > drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +++- > drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +++- > 4 files changed, 22 insertions(+), 25 deletions(-) > The changes look good. However, if the same patches cannot be applied to the different trees without at least 'git am -C2' they need to be tagged as "backported from commit ..." instead of "cherry-picked from commit ...". Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
That's a gray area to me, if you can cherry pick individually to different series, even not being able to git am the exact same .patch, why would it need to be tagged as a backport? I mean, the line "cherry-picked from upstream" is still completely true in this case. On Tue, Jan 07, 2020 at 12:12:57PM +0100, Kleber Souza wrote: > On 2019-12-26 07:51, Ike Panhc wrote: > > BugLink: https://launchpad.net/bugs/1853992 > > BugLink: https://launchpad.net/bugs/1853995 > > BugLink: https://launchpad.net/bugs/1853997 > > BugLink: https://launchpad.net/bugs/1855952 > > > > We have several fixes for Hisilicon SAS host driver and they are clean > > cherry-picked from upstream kernel. > > > > Patch 1 and 4 are potential NULL pointer dereference fix > > Patch 2 is recover device fix > > Patch 3 fixes that some SSD can not use > > > > All changes limit in Hisilicon SAS driver so there is lowest regression > > risk for other platform/driver. > > > > Luo Jiaxing (1): > > scsi: hisi_sas: Fix out of bound at debug_I_T_nexus_reset() > > > > Xiang Chen (3): > > scsi: hisi_sas: Check sas_port before using it > > scsi: hisi_sas: Fix the conflict between device gone and host reset > > scsi: hisi_sas: Assign NCQ tag for all NCQ commands > > > > drivers/scsi/hisi_sas/hisi_sas.h | 1 - > > drivers/scsi/hisi_sas/hisi_sas_main.c | 36 ++++++++++---------------- > > drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +++- > > drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +++- > > 4 files changed, 22 insertions(+), 25 deletions(-) > > > > The changes look good. However, if the same patches cannot be applied to > the different trees without at least 'git am -C2' they need to be tagged > as "backported from commit ..." instead of "cherry-picked from commit ...". > > Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
On 2019-12-26 07:51, Ike Panhc wrote: > BugLink: https://launchpad.net/bugs/1853992 > BugLink: https://launchpad.net/bugs/1853995 > BugLink: https://launchpad.net/bugs/1853997 > BugLink: https://launchpad.net/bugs/1855952 > > We have several fixes for Hisilicon SAS host driver and they are clean > cherry-picked from upstream kernel. > > Patch 1 and 4 are potential NULL pointer dereference fix > Patch 2 is recover device fix > Patch 3 fixes that some SSD can not use > > All changes limit in Hisilicon SAS driver so there is lowest regression > risk for other platform/driver. > > Luo Jiaxing (1): > scsi: hisi_sas: Fix out of bound at debug_I_T_nexus_reset() > > Xiang Chen (3): > scsi: hisi_sas: Check sas_port before using it > scsi: hisi_sas: Fix the conflict between device gone and host reset > scsi: hisi_sas: Assign NCQ tag for all NCQ commands > > drivers/scsi/hisi_sas/hisi_sas.h | 1 - > drivers/scsi/hisi_sas/hisi_sas_main.c | 36 ++++++++++---------------- > drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +++- > drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +++- > 4 files changed, 22 insertions(+), 25 deletions(-) > Applied to bionic/linux, disco/linux and eoan/linux. Thanks, Kleber