Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2017-08-09 10:35:04 +0200
committerOlaf Hering <ohering@suse.de>2017-08-09 10:35:04 +0200
commit1c8934b123f89c824eb72a3bb9bde3f3c64ac93f (patch)
tree1692bdfabca289c91b9f74dc045f0911ff19c125
parent94b098f7dc682f78e2165d36f383f095045a4ee7 (diff)
- Delete stale patches.fixes/scsi-ibmvscsi-module_alias.patch.
- Delete stale patches.suse/suse-ppc64-branding.
-rw-r--r--patches.fixes/scsi-ibmvscsi-module_alias.patch39
-rw-r--r--patches.suse/suse-ppc64-branding25
-rw-r--r--series.conf2
3 files changed, 0 insertions, 66 deletions
diff --git a/patches.fixes/scsi-ibmvscsi-module_alias.patch b/patches.fixes/scsi-ibmvscsi-module_alias.patch
deleted file mode 100644
index 241602273c..0000000000
--- a/patches.fixes/scsi-ibmvscsi-module_alias.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Subject: map scsi proc_name to module name
-From: olh@suse.de
-References: 459933 - LTC50724
-Patch-mainline: not yet, old patch (olaf?)
-
----
- drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/scsi/ibmvscsi/ibmvscsi.c
-+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
-@@ -108,6 +108,9 @@ static struct scsi_transport_template *i
-
- #define IBMVSCSI_VERSION "1.5.9"
-
-+#define IBMVSCSI_PROC_NAME "ibmvscsi"
-+/* The driver is named ibmvscsic, map ibmvscsi to module name */
-+MODULE_ALIAS(IBMVSCSI_PROC_NAME);
- MODULE_DESCRIPTION("IBM Virtual SCSI");
- MODULE_AUTHOR("Dave Boutcher");
- MODULE_LICENSE("GPL");
-@@ -1802,7 +1805,7 @@ static struct device_attribute *ibmvscsi
- static struct scsi_host_template driver_template = {
- .module = THIS_MODULE,
- .name = "IBM POWER Virtual SCSI Adapter " IBMVSCSI_VERSION,
-- .proc_name = "ibmvscsi",
-+ .proc_name = IBMVSCSI_PROC_NAME,
- .queuecommand = ibmvscsi_queuecommand,
- .eh_timed_out = srp_timed_out,
- .eh_abort_handler = ibmvscsi_eh_abort_handler,
-@@ -2069,7 +2072,7 @@ static struct vio_driver ibmvscsi_driver
- .probe = ibmvscsi_probe,
- .remove = ibmvscsi_remove,
- .get_desired_dma = ibmvscsi_get_desired_dma,
-- .name = "ibmvscsi",
-+ .name = IBMVSCSI_PROC_NAME,
- .pm = &ibmvscsi_pm_ops,
- };
-
diff --git a/patches.suse/suse-ppc64-branding b/patches.suse/suse-ppc64-branding
deleted file mode 100644
index 695224a65f..0000000000
--- a/patches.suse/suse-ppc64-branding
+++ /dev/null
@@ -1,25 +0,0 @@
-From: <olh@suse.de>
-Subject: display the product in the frontpanel LCD
-Patch-mainline: never
-
-display the product in the frontpanel LCD
-also the uname -r output instead of uname -v.
-
- arch/powerpc/platforms/pseries/setup.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
---- a/arch/powerpc/platforms/pseries/setup.c
-+++ b/arch/powerpc/platforms/pseries/setup.c
-@@ -510,11 +510,7 @@ static void __init pSeries_setup_arch(vo
- static int __init pSeries_init_panel(void)
- {
- /* Manually leave the kernel version on the panel. */
--#ifdef __BIG_ENDIAN__
-- ppc_md.progress("Linux ppc64\n", 0);
--#else
-- ppc_md.progress("Linux ppc64le\n", 0);
--#endif
-+ ppc_md.progress("SUSE Linux\n", 0);
- ppc_md.progress(init_utsname()->version, 0);
-
- return 0;
diff --git a/series.conf b/series.conf
index b3b3a1bdf8..32ea2d1a6b 100644
--- a/series.conf
+++ b/series.conf
@@ -123,7 +123,6 @@
########################################################
# powerpc/generic
########################################################
- patches.suse/suse-ppc64-branding
########################################################
# powerpc/little endian
@@ -306,7 +305,6 @@
# bnc#362850
patches.fixes/sd_liberal_28_sense_invalid.diff
- patches.fixes/scsi-ibmvscsi-module_alias.patch
########################################################
# DRM/Video