Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-12-11 11:18:42 +0100
committerJiri Kosina <jkosina@suse.cz>2017-12-11 11:18:42 +0100
commit3ecb999be51f2fd327b07d3f26eb661fa868a804 (patch)
tree3ad40689e9ce288e6509a6a18df5fa40497d719e
parent504c575c1ff217e72c1521b1d8f35fe41cd84f7b (diff)
parent53814b003ea980c79282e431f53110d5b849e798 (diff)
Merge remote-tracking branch 'origin/users/mwilck/SLE15/for-next' into SLE15
-rw-r--r--patches.fixes/scsi-scsi_devinfo-cleanly-zero-pad-devinfo-strings.patch3
-rw-r--r--patches.fixes/scsi-scsi_devinfo-handle-non-terminated-strings.patch3
2 files changed, 4 insertions, 2 deletions
diff --git a/patches.fixes/scsi-scsi_devinfo-cleanly-zero-pad-devinfo-strings.patch b/patches.fixes/scsi-scsi_devinfo-cleanly-zero-pad-devinfo-strings.patch
index a3e6a0ecbd..5028d9ad02 100644
--- a/patches.fixes/scsi-scsi_devinfo-cleanly-zero-pad-devinfo-strings.patch
+++ b/patches.fixes/scsi-scsi_devinfo-cleanly-zero-pad-devinfo-strings.patch
@@ -1,8 +1,9 @@
From: Martin Wilck <mwilck@suse.com>
Date: Mon, 27 Nov 2017 23:47:35 +0100
Subject: scsi: scsi_devinfo: cleanly zero-pad devinfo strings
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Git-commit: 81df022b688d43d2a3667518b2f755d384397910
-Patch-mainline: v4.15 or v4.15-rc3 (next release)
+Patch-mainline: Queued in subsystem maintainer repository
References: bsc#1062941, bsc#1037404, bsc#1012523, bsc#1038299
Cleanly fill memory for "vendor" and "model" with 0-bytes for the
diff --git a/patches.fixes/scsi-scsi_devinfo-handle-non-terminated-strings.patch b/patches.fixes/scsi-scsi_devinfo-handle-non-terminated-strings.patch
index f24fbf4707..4db8c8b37d 100644
--- a/patches.fixes/scsi-scsi_devinfo-handle-non-terminated-strings.patch
+++ b/patches.fixes/scsi-scsi_devinfo-handle-non-terminated-strings.patch
@@ -1,8 +1,9 @@
From: Martin Wilck <mwilck@suse.com>
Date: Mon, 27 Nov 2017 23:47:34 +0100
Subject: scsi: scsi_devinfo: handle non-terminated strings
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Git-commit: ba69ead9e9e9bb3cec5faf03526c36764ac8942a
-Patch-mainline: v4.15 or v4.15-rc3 (next release)
+Patch-mainline: Queued in subsystem maintainer repository
References: bsc#1062941, bsc#1037404, bsc#1012523, bsc#1038299
devinfo->vendor and devinfo->model aren't necessarily