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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-06-20 19:04:20 -07:00
parent 6751f63b43 a3650faf40
commit 053812ebfa
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nightly/conf/nightly.conf
View File

@@ -3,15 +3,15 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
5.1.11 \
5.0.20-nc \
5.1.12 \
5.0.21-nc \
4.20.17-nc \
4.19.52-nc \
4.19.53-nc \
4.18.20-nc \
4.17.19-nc \
4.16.18-nc \
4.15.18-nc \
4.14.127-nc \
4.14.128-nc \
4.13.16-nc \
4.12.14-nc \
4.11.12-nc \
@@ -27,9 +27,9 @@ ABT_KERNELS=" \
4.1.52-nc \
4.0.9-nc \
3.19.8-nc \
3.18.139-nc \
3.18.140-nc \
3.17.8-nc \
3.16.66-nc \
3.16.69-nc \
3.15.10-nc \
3.14.79-nc \
3.13.11-nc \

6
scst/include/backport.h
View File

@@ -1636,7 +1636,11 @@ enum {
#define FC_PORT_ROLE_IP_PORT 0x04
#endif
#ifndef FC_PORT_ROLE_NVME_INITIATOR
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
/*
* See also commit d6d20012e116 ("nvme-fabrics: Add FC transport LLDD api
* definitions") # v4.10.
*/
#define FC_PORT_ROLE_NVME_INITIATOR 0x10
#define FC_PORT_ROLE_NVME_TARGET 0x20
#define FC_PORT_ROLE_NVME_DISCOVERY 0x40