Merge pull request #38 from truenas/rebase_master_on_upstream_master

Rebase master on upstream master
truenas · Jan 16, 2025 · a542bbc · a542bbc
2 parents 27618ab + ddd7f08
commit a542bbc
Show file tree

Hide file tree

Showing 61 changed files with 2,721 additions and 3,341 deletions.
diff --git a/.github/workflows/checkpatch_pull.yml b/.github/workflows/checkpatch_pull.yml
@@ -3,6 +3,7 @@ name: Checkpatch upon pull request
 on:
   pull_request:
     branches:
+      - 3.9.x
       - master
 
 jobs:

diff --git a/.github/workflows/checkpatch_push.yml b/.github/workflows/checkpatch_push.yml
@@ -3,6 +3,7 @@ name: Checkpatch upon push
 on:
   push:
     branches:
+      - 3.9.x
       - master
 
 jobs:

diff --git a/.github/workflows/mail_notification.yml b/.github/workflows/mail_notification.yml
@@ -4,7 +4,7 @@ name: Mailing list
 on:
   push:
     branches:
-      - 3.8.x
+      - 3.9.x
       - master
 
 jobs:

diff --git a/.github/workflows/run_regression_tests.yaml b/.github/workflows/run_regression_tests.yaml
@@ -3,10 +3,11 @@ name: Run regression tests
 on:
   push:
     branches:
+      - 3.9.x
       - master
-      - nightly/update
   pull_request:
     branches:
+      - 3.9.x
       - master
 
 jobs:
@@ -17,40 +18,44 @@ jobs:
       fail-fast: false
       matrix:
         version: [
-                  '6.11',
-                  '6.10.10',
+                  '6.12.7',
+                  '6.11.11',
+                  '6.10.14',
                   '6.9.12',
                   '6.8.12',
                   '6.7.12',
-                  '6.6.51',
-                  '6.1.110',
-                  '5.15.167',
-                  '5.10.226',
-                  '5.4.284',
-                  '4.19.322',
+                  '6.6.68',
+                  '6.1.122',
+                  '5.15.175',
+                  '5.10.232',
+                  '5.4.288',
+                  '4.19.325',
                   '4.14.336',
                   '4.9.337',
                   '3.18.140',
                   '3.10.108',
-                  '5.14.0-427.33.1.el9_4^AlmaLinux^9.4',
+                  '5.14.0-503.16.1.el9_5^AlmaLinux^9.5',
+                  '5.14.0-427.42.1.el9_4^AlmaLinux^9.4',
                   '5.14.0-362.24.2.el9_3^AlmaLinux^9.3',
                   '5.14.0-284.30.1.el9_2^AlmaLinux^9.2',
                   '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',
+                  '4.18.0-372.32.1.el8_6^AlmaLinux^8.6',
                   '3.10.0-1160.118.1.el7^CentOS^7.9.2009',
-                  '5.15.0-210.163.7.el9uek^UEK^9',
-                  '5.4.17-2136.335.4.el8uek^UEK^8',
-                  '5.4.17-2102.206.1.el7uek^UEK^7',
-                  '4.1.12-124.48.6.el6uek^UEK^6'
+                  '5.15.0-303.171.5.2.1.el9uek^UEK^9',
+                  '5.4.17-2136.338.4.2.el8uek^UEK^8',
+                  '4.14.35-2047.543.3.el7uek^UEK^7',
+                  '4.1.12-124.92.3.el6uek^UEK^6'
                  ]
     steps:
       - name: Checkout code
         uses: actions/checkout@main
 
       - name: Install libelf-dev
         run: |
-          sudo apt-get install -y libelf-dev
+          sudo apt-get update
+          sudo apt-get install -y libelf-dev libsqlite3-dev
 
       - name: Install sparse
         run: |

diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml
@@ -10,7 +10,7 @@ SCST user space device handler interface description
 	<name>Vladislav Bolkhovitin</name>
 </author>
 
-<date>Version 3.9.0-pre</date>
+<date>Version 3.10.0-pre</date>
 
 <toc>
 

diff --git a/fcst/fcst.h b/fcst/fcst.h
@@ -38,7 +38,7 @@
 #define NEW_LIBFC_API
 #endif
 
-#define FT_VERSION	"3.9.0-pre"
+#define FT_VERSION	"3.10.0-pre"
 #define FT_MODULE	"fcst"
 
 #define FT_MAX_HW_PENDING_TIME	20	/* max I/O time in seconds */

diff --git a/iscsi-scst/README b/iscsi-scst/README
@@ -1,7 +1,7 @@
 iSCSI SCST target driver
 ========================
 
-Version 3.9.0-pre, 15 January 2024
+Version 3.10.0-pre, 28 December 2024
 ----------------------------
 
 ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET)

diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h
@@ -17,4 +17,4 @@
 
 #define ISCSI_VERSION_STRING_SUFFIX
 
-#define ISCSI_VERSION_STRING	"3.9.0-pre" ISCSI_VERSION_STRING_SUFFIX
+#define ISCSI_VERSION_STRING	"3.10.0-pre" ISCSI_VERSION_STRING_SUFFIX
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ name: Checkpatch upon pull request @@
     on:
       pull_request:
         branches:
+          - 3.9.x
           - master
     jobs:
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@

		#define ISCSI_VERSION_STRING_SUFFIX

		#define ISCSI_VERSION_STRING "3.9.0-pre" ISCSI_VERSION_STRING_SUFFIX
		#define ISCSI_VERSION_STRING "3.10.0-pre" ISCSI_VERSION_STRING_SUFFIX