Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into topic/uek-4.1/ofed

Author: SantoshShilimkar

drivers/infiniband/ulp/xsigo/xscore/Makefile

@@ -2,7 +2,7 @@ obj-$(CONFIG_INFINIBAND_XSCORE) := xscore.o
 xscore-y := xscore_impl.o xs_ud.o xscore_api.o xsmp.o \
 	    xscore_stats.o xscore_uadm.o
 
-ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
+ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
 ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
 ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
 ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

drivers/infiniband/ulp/xsigo/xsvhba/Makefile

@@ -3,7 +3,7 @@ xsvhba-y := vhba_main.o vhba_xsmp.o vhba_create.o vhba_init.o vhba_delete.o \
 	    vhba_attr.o vhba_wq.o vhba_proc.o vhba_stats.o vhba_ib.o        \
 	    vhba_scsi_intf.o vhba_align.o
 
-ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
+ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
 ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
 ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
 ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

drivers/infiniband/ulp/xsigo/xsvhba/vhba_main.c

@@ -71,25 +71,25 @@ MODULE_VERSION(DRIVER_VERSION);
  ***********************************/
 
 int cmds_per_lun = 16;
-module_param(cmds_per_lun, int, S_IRWXU);
+module_param(cmds_per_lun, int, 0644);
 
 int vhba_multiple_q = 1;
-module_param(vhba_multiple_q, int, S_IRWXU);
+module_param(vhba_multiple_q, int, 0644);
 
 int vhba_max_transfer_size = VHBA_DEFAULT_TRANSFER_SIZE;
-module_param(vhba_max_transfer_size, int, S_IRWXU);
+module_param(vhba_max_transfer_size, int, 0644);
 
 int vhba_max_q_depth = VHBA_MAX_VH_Q_DEPTH;
-module_param(vhba_max_q_depth, int, S_IRWXU);
+module_param(vhba_max_q_depth, int, 0644);
 
 int vhba_debug = 0x200001;
 module_param(vhba_debug, int, 0644);
 
 int vhba_max_scsi_retry = VHBA_MAX_SCSI_RETRY;
-module_param(vhba_max_scsi_retry, int, S_IRWXU);
+module_param(vhba_max_scsi_retry, int, 0644);
 
 int vhba_default_scsi_timeout = VHBA_DEFAULT_SCSI_TIMEOUT;
-module_param(vhba_default_scsi_timeout, int, S_IRWXU);
+module_param(vhba_default_scsi_timeout, int, 0644);
 
 int vhba_wait_in_boot = 1;
 module_param(vhba_wait_in_boot, int, 0644);

drivers/infiniband/ulp/xsigo/xsvnic/Makefile

@@ -1,7 +1,7 @@
 obj-$(CONFIG_INFINIBAND_XSVNIC) := xsvnic.o
 xsvnic-y := xsvnic_main.o xsvnic_stats.o
 
-ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
+ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
 ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
 ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
 ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

drivers/infiniband/ulp/xsigo/xve/Makefile

@@ -2,7 +2,7 @@ obj-$(CONFIG_INFINIBAND_XVE) := xve.o
 xve-y := xve_main.o xve_verbs.o xve_multicast.o xve_ib.o xve_tables.o \
 	 xve_ethtool.o xve_cm.o xve_stats.o
 
-ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
+ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
 ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
 ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
 ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT