mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-21 20:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-01-07 19:21:19 -08:00
parent 6d164faf9f 8eeb9af891
commit b0174478ea
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fcst/ft_cmd.c
View File

@@ -19,7 +19,7 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <scsi/libfc.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
#include <scsi/fc_encode.h>
#else
#include <scsi/fc/fc_ms.h>

2
fcst/ft_io.c
View File

@@ -24,7 +24,7 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <scsi/libfc.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
#include <scsi/fc_encode.h>
#else
#include <scsi/fc/fc_ms.h>

6
nightly/conf/nightly.conf
View File

@@ -3,19 +3,19 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
5.10.4 \
5.10.5 \
5.9.16-nc \
5.8.18-nc \
5.7.19-nc \
5.6.19-nc \
5.5.19-nc \
5.4.86-nc \
5.4.87-nc \
5.3.18-nc \
5.2.21-nc \
5.1.21-nc \
5.0.21-nc \
4.20.17-nc \
4.19.164-nc \
4.19.165-nc \
4.18.20-nc \
4.17.19-nc \
4.16.18-nc \

3
scst/include/backport.h
View File

@@ -1229,7 +1229,8 @@ static inline int pcie_capability_read_dword(struct pci_dev *dev, int pos,
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
#if !defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8
#if defined(RHEL_RELEASE_CODE) && \
RHEL_RELEASE_CODE -0 >= RHEL_RELEASE_VERSION(8, 3))
/*
* See also commit 09ed79d6d75f ("percpu_ref: introduce PERCPU_REF_ALLOW_REINIT
* flag") # v5.3.