Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-25 15:27:19 +0200
committerTakashi Iwai <tiwai@suse.de>2018-10-25 15:27:19 +0200
commit9487773c3a79d3279e3ef8dd4a4302b9a000821c (patch)
treee391046460d6179be87e75b925c614c18261ab98
parent13209d413d17ad2bec6fdcd8befd13baed9cb3d0 (diff)
Update & sort upstreamed nvme patches
-rw-r--r--patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch3
-rw-r--r--patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch3
-rw-r--r--series.conf6
3 files changed, 4 insertions, 8 deletions
diff --git a/patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch b/patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch
index eb1aeba0e5..b234875eb5 100644
--- a/patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch
+++ b/patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch
@@ -3,8 +3,7 @@ Date: Thu, 27 Sep 2018 16:58:54 -0700
Subject: [PATCH] nvme: call nvme_complete_rq when nvmf_check_ready fails for
mpath I/O
Git-commit: 783f4a4408e1251d17f333ad56abac24dde988b9
-Patch-Mainline: queued in subsystem maintainers repository
-Git-repo: git://git.infradead.org/nvme.git
+Patch-Mainline: v4.20-rc1
References: bsc#1107685
When an io is rejected by nvmf_check_ready() due to validation of the
diff --git a/patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch b/patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch
index 6021f81ca0..2557d070f1 100644
--- a/patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch
+++ b/patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch
@@ -3,8 +3,7 @@ Date: Thu, 13 Sep 2018 16:17:38 -0700
Subject: [PATCH] nvme_fc: add 'nvme_discovery' sysfs attribute to fc transport
device
Git-commit: 97faec531460c949d7120672b8c77e2f41f8d6d7
-Patch-Mainline: queued in subsystem maintainer respository
-Git-repo: git://git.infradead.org/nvme.git
+Patch-Mainline: v4.20-rc1
References: bsc#1044189
The fc transport device should allow for a rediscovery, as userspace
diff --git a/series.conf b/series.conf
index 1c506255fa..0d869a52e9 100644
--- a/series.conf
+++ b/series.conf
@@ -18044,6 +18044,8 @@
patches.arch/x86-time-correct-the-attribute-on-jiffies-definition
patches.arch/x86-fpu-remove-second-definition-of-fpu-in-_fpu__restore_sig
patches.drivers/i2c-rcar-cleanup-DMA-for-all-kinds-of-failure.patch
+ patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch
+ patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch
patches.drivers/ACPI-processor-Fix-the-return-value-of-acpi_processo.patch
patches.drivers/iwlwifi-mvm-send-BCAST-management-frames-to-the-righ.patch
patches.drivers/iwlwifi-dbg-don-t-crash-if-the-firmware-crashes-in-t.patch
@@ -18138,10 +18140,6 @@
patches.fixes/scsi-libfc-check-fc_frame_payload_get-return-value-f.patch
patches.fixes/scsi-libfc-retry-PRLI-if-we-cannot-analyse-the-paylo.patch
- # git://git.infradead.org/nvme.git nvme-4.20
- patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch
- patches.fixes/nvme-call-nvme_complete_rq-when-nvmf_check_ready-fai.patch
-
# out-of-tree patches
patches.suse/md-display-timeout-error.patch
patches.suse/nvme-register-ns_id-attributes-as-default-sysfs-grou.patch