Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

diff --combined drivers/scsi/bfa/bfad.c
index d9e1521,e70410b..5caf5f3
--- 1/drivers/scsi/bfa/bfad.c
--- 2/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@@ -27,7 -27,7 +27,7 @@@
  #include <linux/fs.h>
  #include <linux/pci.h>
  #include <linux/firmware.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  #include <asm/fcntl.h>
  
  #include "bfad_drv.h"
@@@ -64,9 -64,9 +64,9 @@@ int           max_rport_logins = BFA_FCS_MAX_RPO
  u32   bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size;
  u32   *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2;
  
- #define BFAD_FW_FILE_CB               "cbfw-3.2.3.0.bin"
- #define BFAD_FW_FILE_CT               "ctfw-3.2.3.0.bin"
- #define BFAD_FW_FILE_CT2      "ct2fw-3.2.3.0.bin"
+ #define BFAD_FW_FILE_CB               "cbfw-3.2.5.1.bin"
+ #define BFAD_FW_FILE_CT               "ctfw-3.2.5.1.bin"
+ #define BFAD_FW_FILE_CT2      "ct2fw-3.2.5.1.bin"
  
  static u32 *bfad_load_fwimg(struct pci_dev *pdev);
  static void bfad_free_fwimg(void);