Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .qubesbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions kernel.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
23 changes: 23 additions & 0 deletions usb.patch
Original file line number Diff line number Diff line change
@@ -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) {
/*

2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.5
7.2-rc5