diff --git a/.qubesbuilder b/.qubesbuilder index a68c93c0..bf9fcee9 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -8,13 +8,13 @@ source: - dummy-backlight - v4l2loopback files: - - url: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.xz - signature: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.sign - uncompress: true +# - url: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.xz +# signature: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.sign +# uncompress: true ## for -rc kernels, use this: -# - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -# git-basename: linux-@VERSION@ -# tag: v@VERSION@ + - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + git-basename: linux-@VERSION@ + tag: v@VERSION@ pubkeys: - kernel.org-2-key.asc - kernel.org-1-key.asc diff --git a/kernel.spec.in b/kernel.spec.in index 64c67937..1effd6f9 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -150,6 +150,8 @@ Patch61: xen-events-Add-wakeup-support-to-xen-pirq.patch Patch62: xen-pm-use-suspend.patch Patch63: xen-pciback-pm-suspend.patch +Patch99: usb.patch + %description Qubes Dom0 kernel. diff --git a/usb.patch b/usb.patch new file mode 100644 index 00000000..1d35533d --- /dev/null +++ b/usb.patch @@ -0,0 +1,23 @@ +diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c +index ffcb5a961ce8..a4816db5cacd 100644 +--- a/drivers/thunderbolt/nhi.c ++++ b/drivers/thunderbolt/nhi.c +@@ -1241,6 +1241,8 @@ int nhi_probe(struct tb_nhi *nhi) + return dev_err_probe(dev, res, "NHI specific init failed\n"); + } + ++ init_completion(&nhi->domain_released); ++ + tb = nhi_select_cm(nhi); + if (!tb) + return dev_err_probe(dev, -ENODEV, +@@ -1248,8 +1250,6 @@ int nhi_probe(struct tb_nhi *nhi) + + dev_dbg(dev, "NHI initialized, starting thunderbolt\n"); + +- init_completion(&nhi->domain_released); +- + res = tb_domain_add(tb, host_reset); + if (res) { + /* + diff --git a/version b/version index 69adf345..17696cb9 100644 --- a/version +++ b/version @@ -1 +1 @@ -7.1.5 +7.2-rc5