Merge branch 'fixes' into misc

2017-09-07 12:12:43 -07:00
parent a45a1f3614 e6f77540c0
commit 2441500a41
27 changed files with 178 additions and 258 deletions
--- a/drivers/scsi/qedf/qedf.h
+++ b/drivers/scsi/qedf/qedf.h
@@ -526,7 +526,8 @@ struct fip_vlan {
 #define QEDF_WRITE                    (1 << 0)
 #define MAX_FIBRE_LUNS			0xffffffff

-#define QEDF_MAX_NUM_CQS		8
+#define MIN_NUM_CPUS_MSIX(x)	min_t(u32, x->dev_info.num_cqs, \
+					num_online_cpus())

 /*
 * PCI function probe defines