Message ID | 1481557952-7254-1-git-send-email-mauricfo@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
I think we overlapped: https://lists.ubuntu.com/archives/kernel-team/2016-December/081398.html
On 12/13/2016 11:50 AM, Tim Gardner wrote: > I think we overlapped: > > https://lists.ubuntu.com/archives/kernel-team/2016-December/081398.html Indeed. It took a while for my email to be delivered/accepted. I tried again thinking it was a problem on relay. Sorry for the noise. The only difference I see is the subject, w/ the Xenial HWE request. I guess this is implied by your yakkety sru tag? Thanks
On 12/13/2016 06:54 AM, Mauricio Faria de Oliveira wrote: > > The only difference I see is the subject, w/ the Xenial HWE request. > I guess this is implied by your yakkety sru tag? > In this case the Xenial HWE kernel is built from the Yakkety repository, so whatever commits are made to the Yakkety kernel automatically show up in the HWE kernel. However, that will change in the future when Zesty becomes the HWE kernel. But by then Yakkety is EOL anyways.
On 12/13/2016 11:59 AM, Tim Gardner wrote: > On 12/13/2016 06:54 AM, Mauricio Faria de Oliveira wrote: >> The only difference I see is the subject, w/ the Xenial HWE request. >> I guess this is implied by your yakkety sru tag? >> > In this case the Xenial HWE kernel is built from the Yakkety repository, > so whatever commits are made to the Yakkety kernel automatically show up > in the HWE kernel. However, that will change in the future when Zesty > becomes the HWE kernel. But by then Yakkety is EOL anyways. Ok, thanks for the explanation.
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index c5326055beee..f4f77c5b0c83 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -1323,18 +1323,20 @@ struct lpfc_iocbq * { lockdep_assert_held(&phba->hbalock); - BUG_ON(!piocb || !piocb->vport); + BUG_ON(!piocb); list_add_tail(&piocb->list, &pring->txcmplq); piocb->iocb_flag |= LPFC_IO_ON_TXCMPLQ; if ((unlikely(pring->ringno == LPFC_ELS_RING)) && (piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) && - (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN) && - (!(piocb->vport->load_flag & FC_UNLOADING))) - mod_timer(&piocb->vport->els_tmofunc, - jiffies + - msecs_to_jiffies(1000 * (phba->fc_ratov << 1))); + (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) { + BUG_ON(!piocb->vport); + if (!(piocb->vport->load_flag & FC_UNLOADING)) + mod_timer(&piocb->vport->els_tmofunc, + jiffies + + msecs_to_jiffies(1000 * (phba->fc_ratov << 1))); + } return 0; }