diff --git a/.github/workflows/run_regression_tests.yaml b/.github/workflows/run_regression_tests.yaml index ccdb10b26..33fc09ba4 100644 --- a/.github/workflows/run_regression_tests.yaml +++ b/.github/workflows/run_regression_tests.yaml @@ -16,31 +16,32 @@ jobs: fail-fast: false matrix: version: [ - '6.18.2', + '6.19', + '6.18.10', '6.17.13', '6.16.12', '6.15.11', '6.14.11', '6.13.12', - '6.12.63', + '6.12.70', '6.11.11', '6.10.14', '6.9.12', '6.8.12', '6.7.12', - '6.6.119', - '6.1.159', - '5.15.197', - '5.10.247', + '6.6.124', + '6.1.163', + '5.15.200', + '5.10.250', '5.4.302', '4.19.325', '4.14.336', '4.9.337', '3.18.140', '3.10.108', - '6.12.0-124.21.1.el10_1^AlmaLinux^10.1', + '6.12.0-124.31.1.el10_1^AlmaLinux^10.1', '6.12.0-55.43.1.el10_0^AlmaLinux^10.0', - '5.14.0-611.16.1.el9_7^AlmaLinux^9.7', + '5.14.0-611.27.1.el9_7^AlmaLinux^9.7', '5.14.0-570.62.1.el9_6^AlmaLinux^9.6', '5.14.0-503.40.1.el9_5^AlmaLinux^9.5', '5.14.0-427.42.1.el9_4^AlmaLinux^9.4', @@ -48,7 +49,7 @@ jobs: '5.14.0-284.30.1.el9_2^AlmaLinux^9.2', '5.14.0-162.23.1.el9_1^AlmaLinux^9.1', '5.14.0-70.30.1.el9_0^AlmaLinux^9.0', - '4.18.0-553.87.1.el8_10^AlmaLinux^8.10', + '4.18.0-553.104.1.el8_10^AlmaLinux^8.10', '4.18.0-513.24.1.el8_9^AlmaLinux^8.9', '4.18.0-477.13.1.el8_8^AlmaLinux^8.8', '4.18.0-425.19.2.el8_7^AlmaLinux^8.7', @@ -58,9 +59,9 @@ jobs: '4.18.0-240.22.1.el8_3^AlmaLinux^8.3', '3.10.0-1160.118.1.el7^CentOS^7.9.2009', '3.10.0-862.14.4.el7^CentOS^7.5.1804', - '6.12.0-106.55.4.2.el10uek^UEK^10', - '5.15.0-315.196.5.2.el9uek^UEK^9', - '5.4.17-2136.350.3.2.el8uek^UEK^8', + '6.12.0-107.59.3.4.el10uek^UEK^10', + '5.15.0-316.196.4.2.el9uek^UEK^9', + '5.4.17-2136.352.5.el8uek^UEK^8', '4.14.35-2047.543.3.1.el7uek^UEK^7', '4.1.12-124.93.1.el7uek^UEK^7' ] diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 7a98f475c..d545241e2 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,35 +3,36 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -6.18.2 \ +6.19 \ +6.18.10-nc \ 6.17.13-nc \ 6.16.12-nc \ 6.15.11-nc \ 6.14.11-nc \ 6.13.12-nc \ -6.12.63-nc \ +6.12.70-nc \ 6.11.11-nc \ 6.10.14-nc \ 6.9.12-nc \ 6.8.12-nc \ 6.7.12-nc \ -6.6.119-nc \ +6.6.124-nc \ 6.5.13-nc \ 6.4.16-nc \ 6.3.13-nc \ 6.2.16-nc \ -6.1.159-nc \ +6.1.163-nc \ 6.0.19-nc \ 5.19.17-nc \ 5.18.19-nc \ 5.17.15-nc \ 5.16.20-nc \ -5.15.197-nc \ +5.15.200-nc \ 5.14.21-nc \ 5.13.19-nc \ 5.12.19-nc \ 5.11.22-nc \ -5.10.247-nc \ +5.10.250-nc \ 5.9.16-nc \ 5.8.18-nc \ 5.7.19-nc \ @@ -73,9 +74,9 @@ ABT_KERNELS=" \ 3.12.74-nc \ 3.11.10-nc \ 3.10.108-nc \ -6.12.0-124.21.1.el10_1^AlmaLinux^10.1-nc \ +6.12.0-124.31.1.el10_1^AlmaLinux^10.1-nc \ 6.12.0-55.43.1.el10_0^AlmaLinux^10.0-nc \ -5.14.0-611.16.1.el9_7^AlmaLinux^9.7-nc \ +5.14.0-611.27.1.el9_7^AlmaLinux^9.7-nc \ 5.14.0-570.62.1.el9_6^AlmaLinux^9.6-nc \ 5.14.0-503.40.1.el9_5^AlmaLinux^9.5-nc \ 5.14.0-427.42.1.el9_4^AlmaLinux^9.4-nc \ @@ -83,7 +84,7 @@ ABT_KERNELS=" \ 5.14.0-284.30.1.el9_2^AlmaLinux^9.2-nc \ 5.14.0-162.23.1.el9_1^AlmaLinux^9.1-nc \ 5.14.0-70.30.1.el9_0^AlmaLinux^9.0-nc \ -4.18.0-553.87.1.el8_10^AlmaLinux^8.10-nc \ +4.18.0-553.104.1.el8_10^AlmaLinux^8.10-nc \ 4.18.0-513.24.1.el8_9^AlmaLinux^8.9-nc \ 4.18.0-477.13.1.el8_8^AlmaLinux^8.8-nc \ 4.18.0-425.19.2.el8_7^AlmaLinux^8.7-nc \ @@ -99,9 +100,9 @@ ABT_KERNELS=" \ 3.10.0-1062.18.1.el7^CentOS^7.7.1908-nc \ 3.10.0-957.27.2.el7^CentOS^7.6.1810-nc \ 3.10.0-862.14.4.el7^CentOS^7.5.1804-nc \ -6.12.0-106.55.4.2.el10uek^UEK^10-nc \ -5.15.0-315.196.5.2.el9uek^UEK^9-nc \ -5.4.17-2136.350.3.2.el8uek^UEK^8-nc \ +6.12.0-107.59.3.4.el10uek^UEK^10-nc \ +5.15.0-316.196.4.2.el9uek^UEK^9-nc \ +5.4.17-2136.352.5.el8uek^UEK^8-nc \ 4.14.35-2047.543.3.1.el7uek^UEK^7-nc \ 4.1.12-124.93.1.el7uek^UEK^7-nc \ " diff --git a/scst/include/backport.h b/scst/include/backport.h index 1d015ea6c..69939f41c 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -1748,6 +1748,8 @@ static inline int timer_delete_sync(struct timer_list *timer) #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) && \ (LINUX_VERSION_CODE >> 8 != KERNEL_VERSION(6, 1, 0) >> 8 || \ LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 91)) && \ + (LINUX_VERSION_CODE >> 8 != KERNEL_VERSION(5, 15, 0) >> 8 || \ + LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 200)) && \ (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 || \ RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 9 || \ RHEL_MAJOR -0 == 9 && RHEL_MINOR -0 < 3) && \ @@ -1759,6 +1761,7 @@ static inline int timer_delete_sync(struct timer_list *timer) /* * See also commit bb663f0f3c39 ("timers: Rename del_timer() to timer_delete()") # v6.2. * See also commit b086d1e82fcd # v6.1.91. + * See also commit 29d5751350cd # v5.15.200. */ static inline int timer_delete(struct timer_list *timer) {