Merge branch 'develop' into lowlatency-develop

This commit is contained in:
Gregory Lirent 2024-07-02 09:20:05 +03:00
commit 35dab4914d
Signed by: lirent
GPG Key ID: F616BE337EFFEE77
2 changed files with 5 additions and 5 deletions

8
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "submodules/zfsonlinux"]
path = submodules/zfsonlinux
url = ../zfsonlinux
[submodule "submodules/ubuntu-kernel"]
path = submodules/ubuntu-kernel
url = ../mirror_ubuntu-kernels
url = https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/jammy/
[submodule "submodules/zfsonlinux"]
path = submodules/zfsonlinux
url = https://git.proxmox.com/git/zfsonlinux.git

@ -1 +1 @@
Subproject commit ffe6f6578643a9ae802c3eb5a64096f51a0e0524
Subproject commit e72e5ce78b3e7909f68796e16f9daa7f5045d5fd