Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-05-21 14:01:17 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-05-21 14:01:17 +0200
commit8352479b2da5164d9689614dddf5c846d160692e (patch)
treef42c5c0f4e84163ffccb540e6bb523ed2cd1128a
parent722c75e7abd848b8745321553fd6c5bea72f0186 (diff)
- Refresh
patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch. - Refresh patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch.
-rw-r--r--patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch3
-rw-r--r--patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch3
-rw-r--r--series.conf8
3 files changed, 4 insertions, 10 deletions
diff --git a/patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch b/patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
index d062b08630..e7c429d553 100644
--- a/patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
+++ b/patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
@@ -2,8 +2,7 @@ From: Will Deacon <will.deacon@arm.com>
Date: Tue, 23 Apr 2019 11:59:36 +0100
Subject: iommu/arm-smmu-v3: Don't disable SMMU in kdump kernel
Git-commit: 3f54c447df34ff9efac7809a4a80fd3208efc619
-Patch-mainline: Queued in subsystem maintainer repository
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git
+Patch-mainline: v5.2-rc1
References: bsc#1120566
Disabling the SMMU when probing from within a kdump kernel so that all
diff --git a/patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch b/patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch
index f066dbf5a6..9316ab6614 100644
--- a/patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch
+++ b/patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch
@@ -5,8 +5,7 @@ Subject: [PATCH] nvme-multipath: avoid crash on invalid subsystem cntlid
enumeration
Git-commit: 8a03b27ea61c2ab9de16a8a195822ef05e799748
-Patch-Mainline: queued in subsystem maintainer repository
-Git-repo: git://git.infradead.org/nvme.git
+Patch-Mainline: v5.2-rc1
References: bsc#1129273
A process holding an open reference to a removed disk prevents it
diff --git a/series.conf b/series.conf
index ebf1018971..802db1497d 100644
--- a/series.conf
+++ b/series.conf
@@ -45878,6 +45878,7 @@
patches.drivers/mtd-nand-omap-Fix-comment-in-platform-data-using-wro.patch
patches.fixes/0001-mtd-spi-nor-intel-spi-Avoid-crossing-4K-address-boun.patch
patches.drivers/mtd-part-fix-incorrect-format-specifier-for-an-unsig.patch
+ patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
patches.drivers/iommu-vt-d-don-t-request-page-request-irq-under-dmar_global_lock
patches.drivers/iommu-vt-d-set-intel_iommu_gfx_mapped-correctly
patches.drivers/iommu-vt-d-make-kernel-parameter-igfx_off-work-with-viommu
@@ -45906,6 +45907,7 @@
patches.drivers/backlight-lm3630a-Return-0-on-success-in-update_stat.patch
patches.fixes/ACPI-PM-Set-enable_for_wake-for-wakeup-GPEs-during-s.patch
patches.drm/drm-pl111-Initialize-clock-spinlock-early.patch
+ patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
@@ -45932,12 +45934,6 @@
# end of sorted patches
########################################################
- # git://git.infradead.org/nvme.git nvme-5.2
- patches.fixes/nvme-multipath-avoid-crash-on-invalid-subsystem-cntl.patch
-
- # will/linux for-joerg/arm-smmu/updates
- patches.drivers/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
-
########################################################
# upstream patches broken after a merge
########################################################