Skip to content

version 7.0-rc4 #662

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

Draft
marmarek wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

version 7.0-rc4 #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c6db1
Refresh patches for 7.0
marmarek Feb 23, 2026
2874e2d
version 7.0-rc4
marmarek Jan 24, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ source:
- dummy-backlight
- v4l2loopback
files:
- url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.xz
signature: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.sign
uncompress: true
# - url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.xz
# signature: https://cdn.kernel.org/pub/linux/kernel/v6.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
20 changes: 10 additions & 10 deletions 0001-PCI-add-a-reset-quirk-for-Intel-I219LM-ethernet-adap.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4859917799b85e3eeb6582f784e13ea244245849 Mon Sep 17 00:00:00 2001
From 3eae20a41127e9b24ff1f2c4c08fa2c1e5906982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Mon, 15 Jul 2024 16:55:56 +0200
Expand All @@ -23,23 +23,23 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
3 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e9448d55113bd..4492049395fce 100644
index 8479c2e1f74f..2465c9acf60b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4559,7 +4559,7 @@ int pcie_reset_flr(struct pci_dev *dev, bool probe)
@@ -4385,7 +4385,7 @@ int pcie_reset_flr(struct pci_dev *dev, bool probe)
}
EXPORT_SYMBOL_GPL(pcie_reset_flr);

-static int pci_af_flr(struct pci_dev *dev, bool probe)
+int pci_af_flr(struct pci_dev *dev, bool probe)
{
int ret;
int pos;
u8 cap;
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 12215ee72afb6..8e83b7905cb37 100644
index 13d998fbacce..cb7acc605fea 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -850,6 +850,7 @@ void pcie_reset_lbms(struct pci_dev *port);
@@ -1128,6 +1128,7 @@ void pcie_reset_lbms(struct pci_dev *port);
#else
static inline void pcie_reset_lbms(struct pci_dev *port) {}
#endif
Expand All @@ -48,10 +48,10 @@ index 12215ee72afb6..8e83b7905cb37 100644
struct pci_dev_reset_methods {
u16 vendor;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index d7f4ee634263c..a8ddc34902ab0 100644
index 48946cca4be7..8960d3ae370a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4205,6 +4205,74 @@ static int reset_hinic_vf_dev(struct pci_dev *pdev, bool probe)
@@ -4239,6 +4239,74 @@ static int reset_hinic_vf_dev(struct pci_dev *pdev, bool probe)
return 0;
}

Expand Down Expand Up @@ -126,7 +126,7 @@ index d7f4ee634263c..a8ddc34902ab0 100644
static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82599_SFP_VF,
reset_intel_82599_sfp_virtfn },
@@ -4220,6 +4288,8 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
@@ -4254,6 +4322,8 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
reset_chelsio_generic_dev },
{ PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HINIC_VF,
reset_hinic_vf_dev },
Expand All @@ -136,5 +136,5 @@ index d7f4ee634263c..a8ddc34902ab0 100644
};

--
2.49.0
2.52.0

2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.19.5
7.0-rc4
26 changes: 13 additions & 13 deletions xen-pm-use-suspend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 895c01cc7e63404250fd9763c4fb91620ad63a4c Mon Sep 17 00:00:00 2001
From 7e1526209cf972f51281558f1cb979d18e49cdd1 Mon Sep 17 00:00:00 2001
From: Simon Gaiser <simon@invisiblethingslab.com>
Date: Tue, 30 Apr 2024 14:27:33 +0200
Subject: [PATCH] Add experimental flag to use suspend instad of freeze for Xen
Expand Down Expand Up @@ -26,10 +26,10 @@ and the new behavior adapted accordingly.
2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index c16df629907e..1b723c68cc3c 100644
index e20c40a62e64..dec7b7d544c9 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -46,6 +46,9 @@ struct suspend_info {
@@ -47,6 +47,9 @@ struct suspend_info {

static RAW_NOTIFIER_HEAD(xen_resume_notifier);

Expand All @@ -39,7 +39,7 @@ index c16df629907e..1b723c68cc3c 100644
void xen_resume_notifier_register(struct notifier_block *nb)
{
raw_notifier_chain_register(&xen_resume_notifier, nb);
@@ -113,7 +116,10 @@ static void do_suspend(void)
@@ -114,7 +117,10 @@ static void do_suspend(void)
goto out_thaw;
}

Expand All @@ -51,7 +51,7 @@ index c16df629907e..1b723c68cc3c 100644
if (err) {
pr_err("%s: dpm_suspend_start %d\n", __func__, err);
goto out_resume_end;
@@ -122,7 +128,7 @@ static void do_suspend(void)
@@ -123,7 +129,7 @@ static void do_suspend(void)
printk(KERN_DEBUG "suspending xenstore...\n");
xs_suspend();

Expand All @@ -60,7 +60,7 @@ index c16df629907e..1b723c68cc3c 100644
if (err) {
pr_err("dpm_suspend_end failed: %d\n", err);
si.cancelled = 0;
@@ -143,7 +149,7 @@ static void do_suspend(void)
@@ -144,7 +150,7 @@ static void do_suspend(void)

xen_arch_resume();

Expand All @@ -69,7 +69,7 @@ index c16df629907e..1b723c68cc3c 100644

if (err) {
pr_err("failed to start xen_suspend: %d\n", err);
@@ -156,7 +162,7 @@ static void do_suspend(void)
@@ -158,7 +164,7 @@ static void do_suspend(void)
xs_suspend_cancel();

out_resume_end:
Expand All @@ -79,23 +79,23 @@ index c16df629907e..1b723c68cc3c 100644
out_thaw:
thaw_processes();
diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
index fcb335bb7b18..5caa5b2369fb 100644
index f04707d1f667..d9273b9f35a5 100644
--- a/drivers/xen/xenbus/xenbus_probe_frontend.c
+++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -98,8 +98,13 @@ static void xenbus_frontend_delayed_resume(struct work_struct *w)
xenbus_dev_resume(&xdev->dev);
@@ -98,8 +98,13 @@ static void xenbus_frontend_delayed_restore(struct work_struct *w)
xenbus_dev_restore(&xdev->dev);
}

+extern bool __read_mostly xen_use_suspend;
+
static int xenbus_frontend_dev_resume(struct device *dev)
static int xenbus_frontend_dev_restore(struct device *dev)
{
+ if (xen_use_suspend)
+ return xenbus_dev_cancel(dev);
+ return xenbus_dev_thaw(dev);
+
/*
* If xenstored is running in this domain, we cannot access the backend
* state at the moment, so we need to defer xenbus_dev_resume
--
2.43.0
2.52.0