f4ff13 Merge remote-tracking branch 'origin/SLE12-SP4' into SLE12-SP5

Merged and Committed by Denis Kirjanov 4 years ago
18 files changed. 19 lines added. 21 lines removed.
patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch
file modified
+1 -1
patches.suse/0002-efi-Add-EFI-signature-data-types.patch
file modified
+2 -4
patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch
file modified
+1 -1
patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch
file modified
+1 -1
patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch
file modified
+1 -1
patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch
file modified
+1 -1
patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch
file modified
+1 -1
patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch
file modified
+1 -1
patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch
file modified
+1 -1
patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch
file modified
+1 -1
patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch
file modified
+1 -1
patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch
file modified
+1 -1
patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch
file modified
+1 -1
patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch
file modified
+1 -1
patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch
file modified
+1 -1
patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch
file modified
+1 -1
patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch
file modified
+1 -1
series.conf
file modified
+1 -1
    Merge remote-tracking branch 'origin/SLE12-SP4' into SLE12-SP5
    
     Conflicts:
    	patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch
    	patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch
    	patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch
    	patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch
    	patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch
    	patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch
    	patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch
    	patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch
    	patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch
    	patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch
    	patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch
    	patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch
    	patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch
    	patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch
    	patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch
    	patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch
    	series.conf
    
        
file modified
+1 -1