Skip to content

Sync 6.12 with 25.10.5 release branch #301

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.

Sign up for GitHub

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

Merged
yocalebo merged 3 commits into from
Jun 22, 2026
Merged

Sync 6.12 with 25.10.5 release branch #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c19d23
Fix use-after-free in NVDIMM pmem driver DMA
amotin Jun 4, 2026
3b866fa
Disable in-kernel NTFS3 driver
yocalebo Apr 22, 2026
7dc9b19
Disable brd
ixhamza Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/nvdimm/pmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,8 @@ static bool pmem_dma_submit_bio(struct pmem_device *pmem, struct bio *bio,
}
last_cookie1 = cookie;
i += dmas;
if (cb)
break;
}
dma_async_issue_pending(dma_chan1);

Expand Down Expand Up @@ -373,6 +375,8 @@ static bool pmem_dma_submit_bio(struct pmem_device *pmem, struct bio *bio,
}
last_cookie2 = cookie;
i += 2;
if (cb)
break;
}
dma_async_issue_pending(dma_chan2);
return true;
Expand Down
16 changes: 16 additions & 0 deletions scripts/package/truenas/truenas.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,22 @@ CONFIG_MODULE_COMPRESS_XZ=n
# driver and we don't support this in the field either.
CONFIG_MD=n

#
# NAS-141460: Do not build brd, the RAM-disk block driver. TrueNAS has no use
# for it, but any root user can load it to create RAM-backed block devices on
# demand; a customer did this on a production system, creating many RAM disks
# and breaking HA failover. brd is not used by the kernel, OpenZFS, middleware,
# or the build, so we do not build it.
#
CONFIG_BLK_DEV_RAM=n

#
# Disable in-kernel NTFS3 driver. TrueNAS does not natively support
# NTFS, and the in-tree ntfs3 driver has produced kernel panics during
# filesystem enumeration.
#
CONFIG_NTFS3_FS=n

#
# Compile Linux kernel with warnings as errors
#
Expand Down
Loading