Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase truenas-3.9.0-pre on master #36

Merged
merged 8 commits into from
Nov 13, 2024
Merged

Conversation

bmeagherix
Copy link

Previously rebased master on upstream master. Now rebase truenas-3.9.0-pre on master.

This will pickup recent upstream changes including: "scst: Port to Linux kernel v6.12" (256d695)

git clone https://github.com/truenas/scst.git
cd scst
git branch
git checkout -b rebase_on_master
git log
git rebase -i origin/master
git diff origin/master...rebase_on_master
git diff rebase_on_master...truenas-3.9.0-pre
git diff truenas-3.9.0-pre...rebase_on_master
git push --set-upstream origin rebase_on_master

CI custom build here and corresponding CI run here.

lnocturno and others added 8 commits October 1, 2024 16:17
Use checkpatch --strict to detect more style issues.
Support for the following changes in the Linux kernel v6.12:

- 5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
- cb787f4ac0c2 ("[tree-wide] finally take no_llseek out")
Also allow regression tests to run upon a pull request.
Inroduce several checkpatch scripts to use in workflows.
The workqueue maintainer wants to remove the create*_workqueue() macros
because these macros always set the WQ_MEM_RECLAIM flag and because these
only support literal workqueue names. Hence this patch that replaces the
create*_workqueue() invocations with the definition of this macro. The
WQ_MEM_RECLAIM flag has been retained because I think that flag is necessary
for workqueues created by storage drivers.
…c_port

The 'del_list_entry' field in "struct fc_port" is unused.

The field was introduced in commit 2d70c103fd2a ("[SCSI] qla2xxx: Add LLD
target-mode infrastructure for >= 24xx series") in 2012-05 and the last
user was removed in commit 726b85487067 ("qla2xxx: Add framework for async
fabric discovery") in 2017-02.

Remove this unused field.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/69155321ab26c1f4d473d5bb6cd44b59b9b6a020.1724094686.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
[ commit e59f43fb6477 upstream ]
@bmeagherix bmeagherix requested a review from yocalebo November 13, 2024 21:16
Copy link

@yocalebo yocalebo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@bmeagherix bmeagherix merged commit 3b30818 into truenas-3.9.0-pre Nov 13, 2024
37 of 42 checks passed
@bmeagherix bmeagherix deleted the rebase_on_master branch November 13, 2024 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants