Comment 12 for bug 1768103

I attempted to apply patchs 4/6 and 5/6 to Bionic but ran into some issues. Patch 4 does not apply and is trying to make changes to code that never existed in mainline or Bionic. For example I don't see a git history in mainline that the struct lpfc_sli_asic_rev ever existed and the patch is trying to remove it:

--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -104,17 +104,6 @@ struct lpfc_sli_intf {
 #define LPFC_SLI_INTF_IF_TYPE_VIRT 1
 };

-struct lpfc_sli_asic_rev {
- u32 word0;
-#define LPFC_SLI_ASIC_VER_A 0x0
-#define LPFC_SLI_ASIC_VER_B 0x1
-#define LPFC_SLI_ASIC_VER_C 0x2
-#define LPFC_SLI_ASIC_VER_D 0x3
-#define lpfc_sli_asic_ver_SHIFT 4
-#define lpfc_sli_asic_ver_MASK 0x0000000F
-#define lpfc_sli_asic_ver_WORD word0
-};
-
 #define LPFC_SLI4_MBX_EMBED true
 #define LPFC_SLI4_MBX_NEMBED false

Patch 5/6 looks like it will apply fine. Is there another version of the patch 4, or can you see if it's still needed?