diff --git a/Makefile b/Makefile index 25f00e0..81a7da5 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,12 @@ endif all: help MIRROR := cdn.kernel.org +ifeq (,$(DISTFILES_MIRROR)) SRC_BASEURL := https://${MIRROR}/pub/linux/kernel/v$(shell echo $(VERSION) | sed 's/^\(2\.[0-9]*\).*/\1/;s/^3\..*/3.x/;s/^4\..*/4.x/') +else +SRC_BASEURL := $(DISTFILES_MIRROR) +endif + SRC_FILE := linux-${VERSION}.tar.xz ifeq ($(BUILD_FLAVOR),pvops) SIGN_FILE := linux-${VERSION}.tar.sign diff --git a/patches.backports/63e708f826bb-x86-xen-Calculate-__max_logical_packages-on-PV-domai.patch b/patches.backports/63e708f826bb-x86-xen-Calculate-__max_logical_packages-on-PV-domai.patch deleted file mode 100644 index abe1624..0000000 --- a/patches.backports/63e708f826bb-x86-xen-Calculate-__max_logical_packages-on-PV-domai.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 63e708f826bb21470155d37b103a75d8a9e25b18 Mon Sep 17 00:00:00 2001 -From: Prarit Bhargava -Date: Wed, 7 Feb 2018 18:49:23 -0500 -Subject: [PATCH] x86/xen: Calculate __max_logical_packages on PV domains - -The kernel panics on PV domains because native_smp_cpus_done() is -only called for HVM domains. - -Calculate __max_logical_packages for PV domains. - -Fixes: b4c0a7326f5d ("x86/smpboot: Fix __max_logical_packages estimate") -Signed-off-by: Prarit Bhargava -Tested-and-reported-by: Simon Gaiser -Cc: Thomas Gleixner -Cc: Ingo Molnar -Cc: "H. Peter Anvin" -Cc: x86@kernel.org -Cc: Boris Ostrovsky -Cc: Juergen Gross -Cc: Dou Liyang -Cc: Prarit Bhargava -Cc: Kate Stewart -Cc: Greg Kroah-Hartman -Cc: Andy Lutomirski -Cc: Andi Kleen -Cc: Vitaly Kuznetsov -Cc: xen-devel@lists.xenproject.org -Reviewed-by: Boris Ostrovsky -Signed-off-by: Juergen Gross ---- - arch/x86/include/asm/smp.h | 1 + - arch/x86/kernel/smpboot.c | 10 ++++++++-- - arch/x86/xen/smp.c | 2 ++ - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h -index 461f53d27708..a4189762b266 100644 ---- a/arch/x86/include/asm/smp.h -+++ b/arch/x86/include/asm/smp.h -@@ -129,6 +129,7 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) - void cpu_disable_common(void); - void native_smp_prepare_boot_cpu(void); - void native_smp_prepare_cpus(unsigned int max_cpus); -+void calculate_max_logical_packages(void); - void native_smp_cpus_done(unsigned int max_cpus); - void common_cpu_up(unsigned int cpunum, struct task_struct *tidle); - int native_cpu_up(unsigned int cpunum, struct task_struct *tidle); -diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c -index cfc61e1d45e2..9eee25d07586 100644 ---- a/arch/x86/kernel/smpboot.c -+++ b/arch/x86/kernel/smpboot.c -@@ -1281,11 +1281,10 @@ void __init native_smp_prepare_boot_cpu(void) - cpu_set_state_online(me); - } - --void __init native_smp_cpus_done(unsigned int max_cpus) -+void __init calculate_max_logical_packages(void) - { - int ncpus; - -- pr_debug("Boot done\n"); - /* - * Today neither Intel nor AMD support heterogenous systems so - * extrapolate the boot cpu's data to all packages. -@@ -1293,6 +1292,13 @@ void __init native_smp_cpus_done(unsigned int max_cpus) - ncpus = cpu_data(0).booted_cores * topology_max_smt_threads(); - __max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus); - pr_info("Max logical packages: %u\n", __max_logical_packages); -+} -+ -+void __init native_smp_cpus_done(unsigned int max_cpus) -+{ -+ pr_debug("Boot done\n"); -+ -+ calculate_max_logical_packages(); - - if (x86_has_numa_in_package) - set_sched_topology(x86_numa_in_package_topology); -diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c -index 77c959cf81e7..7a43b2ae19f1 100644 ---- a/arch/x86/xen/smp.c -+++ b/arch/x86/xen/smp.c -@@ -122,6 +122,8 @@ void __init xen_smp_cpus_done(unsigned int max_cpus) - - if (xen_hvm_domain()) - native_smp_cpus_done(max_cpus); -+ else -+ calculate_max_logical_packages(); - - if (xen_have_vcpu_info_placement) - return; --- -2.16.1 - diff --git a/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch b/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch deleted file mode 100644 index 6a4dd2f..0000000 --- a/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch +++ /dev/null @@ -1,41 +0,0 @@ -From patchwork Mon Oct 16 14:48:55 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: Input: synaptics - add Intertouch support on X1 Carbon 6th and X280 -From: Aaron Ma -X-Patchwork-Id: 10008513 -Message-Id: <1508165335-16738-1-git-send-email-aaron.ma@canonical.com> -To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, - dmitry.torokhov@gmail.com, aaron.ma@canonical.com -Date: Mon, 16 Oct 2017 22:48:55 +0800 - -Synaptics devices reported it has Intertouch support, -and it fails via PS/2 as following logs: - -psmouse serio2: Failed to reset mouse on synaptics-pt/serio0 -psmouse serio2: Failed to enable mouse on synaptics-pt/serio0 - -Set these new devices to use SMBus to fix this issue, -then they report SMBus version 3 is using, -patch: https://patchwork.kernel.org/patch/9989547/ enabled SMBus ver 3 and -makes synaptics devices work fine on SMBus mode. - -Signed-off-by: Aaron Ma ---- - drivers/input/mouse/synaptics.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index 5af0b7d200bc..da3a5e40e80c 100644 ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -173,6 +173,8 @@ static const char * const smbus_pnp_ids[] = { - "LEN004a", /* W541 */ - "LEN0073", /* X1 Carbon 5 */ - "LEN200f", /* T450s */ -+ "LEN0092", /* X1 Carbon 6 */ -+ "LEN0096", /* X280 */ - "LEN2018", /* T460p */ - NULL - }; diff --git a/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch b/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch deleted file mode 100644 index f232725..0000000 --- a/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch +++ /dev/null @@ -1,28 +0,0 @@ -From patchwork Fri Oct 6 14:06:30 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v2,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI -From: Yiannis Marangos -X-Patchwork-Id: 9989549 -Message-Id: <20171006140630.6398-3-yiannis.marangos@gmail.com> -To: linux-input@vger.kernel.org -Cc: Yiannis Marangos -Date: Fri, 6 Oct 2017 17:06:30 +0300 - ---- - drivers/input/mouse/synaptics.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index 5af0b7d200bc..eecb8872c1a5 100644 ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = { - "LEN0048", /* X1 Carbon 3 */ - "LEN0046", /* X250 */ - "LEN004a", /* W541 */ -+ "LEN0073", /* X1 Carbon 5 */ - "LEN200f", /* T450s */ - "LEN2018", /* T460p */ - NULL diff --git a/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch b/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch index 7ba0724..eb3cc61 100644 --- a/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch +++ b/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch @@ -18,7 +18,7 @@ diff --git a/block/genhd.c b/block/genhd.c index 9f42526..85b71f5 100644 --- a/block/genhd.c +++ b/block/genhd.c -@@ -572,6 +572,15 @@ exit: +@@ -628,6 +628,15 @@ WARN_ON(err); } @@ -32,9 +32,9 @@ index 9f42526..85b71f5 100644 +MODULE_PARM_DESC(no_part_scan, "When adding block devices, always mark them as not to be scanned for partitions"); + /** - * device_add_disk - add partitioning information to kernel list + * __device_add_disk - add disk information to kernel list * @parent: parent device for the disk -@@ -587,6 +596,9 @@ void device_add_disk(struct device *parent, struct gendisk *disk) +@@ -645,6 +654,9 @@ dev_t devt; int retval; diff --git a/patches.xen/pci_op-cleanup.patch b/patches.xen/pci_op-cleanup.patch index 79be7f8..4628732 100644 --- a/patches.xen/pci_op-cleanup.patch +++ b/patches.xen/pci_op-cleanup.patch @@ -53,12 +53,12 @@ Date: Wed Apr 1 17:01:26 2015 -0400 drivers/xen/xen-pciback/pciback_ops.c diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c -index b1ffebe..353c8a2 100644 +index 8785014..d458e53 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c -@@ -297,7 +297,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, +@@ -298,7 +298,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, } else { - dev_err(&dev->dev, "enable msix get err %x\n", err); + pci_err(dev, "enable msix get err %x\n", err); } - return err; + return err ? -EINVAL : 0; @@ -66,13 +66,13 @@ index b1ffebe..353c8a2 100644 static void pci_frontend_disable_msix(struct pci_dev *dev) diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c -index fa2b222..4db6c19 100644 +index ee2c891..573590b 100644 --- a/drivers/xen/xen-pciback/pciback_ops.c +++ b/drivers/xen/xen-pciback/pciback_ops.c -@@ -266,7 +266,7 @@ error: +@@ -268,7 +268,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev, if (dev_data) dev_data->ack_intr = 0; - + - return result > 0 ? 0 : result; + return result >= 0 ? 0 : XEN_PCI_ERR_op_failed; } diff --git a/series.conf b/series.conf index 2c1c1a1..392c2bc 100644 --- a/series.conf +++ b/series.conf @@ -33,10 +33,4 @@ patches.xen/Revert-xen-avoid-deadlock-in-xenbus-driver.patch patches.xen/Revert-xenbus-remove-transaction-holder-from-list-be.patch patches.xen/Revert-xen-optimize-xenbus-driver-for-multiple-concu.patch -# Backport for regression in 4.15 in smpboot.c -patches.backports/63e708f826bb-x86-xen-Calculate-__max_logical_packages-on-PV-domai.patch - # Hardware-specific fixes, backported from newer kernel and/or developers branches -patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch -patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch - diff --git a/version b/version index 3453134..469f283 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.15.6 +4.16.2