Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2021-10-27 20:43:04 -07:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -20,7 +20,7 @@
#include <linux/types.h>
#include <scsi/libfc.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) && \
!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) && \
!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 17) && \
defined(UEK_KABI_RENAME))
#include <scsi/fc_encode.h>
#else
+1 -1
View File
@@ -25,7 +25,7 @@
#include <linux/types.h>
#include <scsi/libfc.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) && \
!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) && \
!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 17) && \
defined(UEK_KABI_RENAME))
#include <scsi/fc_encode.h>
#else