Merge branch 'develop' into lowlatency-develop
This commit is contained in:
commit
35dab4914d
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -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
|
Loading…
Reference in New Issue
Block a user