Additionally, this one did not cleanly apply:
Additionally, this one does not cleanly apply when cherry-picked:
765ab6cdac3b681952da0e22184bf6cf1ae41cf8 scsi: lpfc: Fix a kernel
warning triggered by lpfc_get_sgl_per_hdwq()
bladernr@galactica:~/development/kernels-ubuntu/focal$ cherrypick
765ab6cdac3b681952da0e22184bf6cf1ae41cf8
error: could not apply 765ab6cdac3b... scsi: lpfc: Fix a kernel warning
triggered by lpfc_get_sgl_per_hdwq()
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
bladernr@galactica:~/development/kernels-ubuntu/focal$ git diff
diff --cc drivers/scsi/lpfc/lpfc_sli.c
index e660ee98ad8b,613fbf4a7da9..000000000000
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@@ -20687,7 -20668,7 +20687,11 @@@ lpfc_get_sgl_per_hdwq(struct lpfc_hba *
/* allocate more */
spin_unlock_irqrestore(&hdwq->hdwq_lock, iflags);
tmp = kmalloc_node(sizeof(*tmp), GFP_ATOMIC,
++<<<<<<< HEAD
+ cpu_to_node(hdwq->io_wq->chann));
++=======
+ cpu_to_node(raw_smp_processor_id()));
++>>>>>>> 765ab6cdac3b... scsi: lpfc: Fix a kernel warning triggered by
lpfc_get_sgl_per_hdwq()
if (!tmp) {
lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
"8353 error kmalloc memory for HDWQ "
@@@ -20830,7 -20811,7 +20834,11 @@@ lpfc_get_cmd_rsp_buf_per_hdwq(struct lp
/* allocate more */
spin_unlock_irqrestore(&hdwq->hdwq_lock, iflags);
tmp = kmalloc_node(sizeof(*tmp), GFP_ATOMIC,
++<<<<<<< HEAD
+ cpu_to_node(hdwq->io_wq->chann));
++=======
+ cpu_to_node(raw_smp_processor_id()));
++>>>>>>> 765ab6cdac3b... scsi: lpfc: Fix a kernel warning triggered by
lpfc_get_sgl_per_hdwq()
if (!tmp) {
lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
"8355 error kmalloc memory for HDWQ "
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1855303
Title:
Update Broadcom Emulex lpfc driver in 5.4 to 12.6.0.x from 5.5
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1855303/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
