From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 7 Oct 2016 04:03:00 +0000 (+0200)
Subject: 4.7-stable patches
X-Git-Tag: v4.8.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d775e9c094266ef495bb9be4de1f1f4f0a61dab;p=thirdparty%2Fkernel%2Fstable-queue.git

4.7-stable patches

added patches:
	scsi-sas-provide-stub-implementation-for-scsi_is_sas_rphy.patch
---

diff --git a/queue-4.7/scsi-sas-provide-stub-implementation-for-scsi_is_sas_rphy.patch b/queue-4.7/scsi-sas-provide-stub-implementation-for-scsi_is_sas_rphy.patch
new file mode 100644
index 00000000000..5dbde53bfb4
--- /dev/null
+++ b/queue-4.7/scsi-sas-provide-stub-implementation-for-scsi_is_sas_rphy.patch
@@ -0,0 +1,48 @@
+From c1a23f6d64552b4480208aa584ec7e9c13d6d9c3 Mon Sep 17 00:00:00 2001
+From: Johannes Thumshirn <jthumshirn@suse.de>
+Date: Wed, 17 Aug 2016 11:46:16 +0200
+Subject: scsi: sas: provide stub implementation for scsi_is_sas_rphy
+
+From: Johannes Thumshirn <jthumshirn@suse.de>
+
+commit c1a23f6d64552b4480208aa584ec7e9c13d6d9c3 upstream.
+
+Provide a stub implementation for scsi_is_sas_rphy for kernel
+configurations which do not have CONFIG_SCSI_SAS_ATTRS defined.
+
+Reported-by: kbuild test robot <lkp@intel.com>
+Suggested-by: James Bottomley <jejb@linux.vnet.ibm.com>
+Reviewed-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
+Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/scsi/scsi_transport_sas.h |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/include/scsi/scsi_transport_sas.h
++++ b/include/scsi/scsi_transport_sas.h
+@@ -15,8 +15,14 @@ static inline int is_sas_attached(struct
+ {
+ 	return 0;
+ }
++
++static inline int scsi_is_sas_rphy(const struct device *sdev)
++{
++	return 0;
++}
+ #else
+ extern int is_sas_attached(struct scsi_device *sdev);
++extern int scsi_is_sas_rphy(const struct device *);
+ #endif
+ 
+ static inline int sas_protocol_ata(enum sas_protocol proto)
+@@ -202,7 +208,6 @@ extern int sas_rphy_add(struct sas_rphy
+ extern void sas_rphy_remove(struct sas_rphy *);
+ extern void sas_rphy_delete(struct sas_rphy *);
+ extern void sas_rphy_unlink(struct sas_rphy *);
+-extern int scsi_is_sas_rphy(const struct device *);
+ 
+ struct sas_port *sas_port_alloc(struct device *, int);
+ struct sas_port *sas_port_alloc_num(struct device *);
diff --git a/queue-4.7/series b/queue-4.7/series
index bc71c54573d..135049d55ae 100644
--- a/queue-4.7/series
+++ b/queue-4.7/series
@@ -119,6 +119,7 @@ ib-ipoib-fix-memory-corruption-in-ipoib-cm-mode-connect-flow.patch
 ath10k-fix-get-rx_status-from-htt-context.patch
 ib-core-fix-use-after-free-in-send_leave-function.patch
 regmap-rbtree-avoid-overlapping-nodes.patch
+scsi-sas-provide-stub-implementation-for-scsi_is_sas_rphy.patch
 scsi-ses-use-scsi_is_sas_rphy-instead-of-is_sas_attached.patch
 ib-ipoib-don-t-allow-mc-joins-during-light-mc-flush.patch
 ib-mlx4-fix-incorrect-mc-join-state-bit-masking-on-sr-iov.patch