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

* topic/uek-4.1/drivers: (200 commits)
  scsi: megaraid-sas: request irqs later
  scsi: megaraid_sas: add in missing white spaces in error messages text
  scsi: megaraid_sas: fix macro MEGASAS_IS_LOGICAL to avoid regression
  scsi: megaraid_sas: driver version upgrade
  scsi: megaraid_sas: Do not set MPI2_TYPE_CUDA for JBOD FP path for FW which does not support JBOD sequence map
  scsi: megaraid_sas: Send SYNCHRONIZE_CACHE for VD to firmware
  scsi: megaraid_sas: Do not fire DCMDs during PCI shutdown/detach
  scsi: megaraid_sas: Send correct PhysArm to FW for R1 VD downgrade
  scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs before reset
  scsi: megaraid_sas: Fix data integrity failure for JBOD (passthrough) devices
  scsi: megaraid_sas: clean function declarations in megaraid_sas_base.c up
  scsi: megaraid_sas: add in missing white space in error message text
  scsi: megaraid_sas: Fix the search of first memory bar
  scsi: megaraid_sas: Use memdup_user() rather than duplicating its implementation
  megaraid_sas: Fix probing cards without io port
  megaraid_sas: Do not fire MR_DCMD_PD_LIST_QUERY to controllers which do not support it
  megaraid_sas: Downgrade two success messages to info
  megaraid_sas: driver version upgrade
  megaraid_sas: task management code optimizations
  megaraid_sas: call ISR function to clean up pending replies in OCR path
  ...

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/scsi/aacraid/aacraid.h
index 18c9c0648bd0f35345b9552fb109af4d8ff87eb7,f1cab0e4907a76d190e7cb05d780f8da35b93ba1..09f3dffe6b3f5060365079b438e478cdcb23f064
--- 1/drivers/scsi/aacraid/aacraid.h
--- 2/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@@ -2098,9 -2129,11 +2130,12 @@@ static inline unsigned int cap_to_cyls(
  #define AAC_OWNER_ERROR_HANDLER       0x103
  #define AAC_OWNER_FIRMWARE    0x106
  
+ int aac_acquire_irq(struct aac_dev *dev);
+ void aac_free_irq(struct aac_dev *dev);
  const char *aac_driverinfo(struct Scsi_Host *);
 +void aac_fib_vector_assign(struct aac_dev *dev);
  struct fib *aac_fib_alloc(struct aac_dev *dev);
+ struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd);
  int aac_fib_setup(struct aac_dev *dev);
  void aac_fib_map_free(struct aac_dev *dev);
  void aac_fib_free(struct fib * context);

diff --cc drivers/scsi/aacraid/commctrl.c
Simple merge

diff --cc drivers/scsi/aacraid/commsup.c
Simple merge

diff --cc drivers/scsi/aacraid/src.c
index 81315a14ef398926aedf3a36e119e0e93a7979bb,8b000d6fe8f6cbf9c1edb3779124c2460478e1f6..0c453880f214bd46dd1580b5a07b45305446c186
--- 1/drivers/scsi/aacraid/src.c
--- 2/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@@ -447,8 -448,11 +448,12 @@@ static int aac_src_deliver_message(stru
        u32 fibsize;
        dma_addr_t address;
        struct aac_fib_xporthdr *pFibX;
+ #if !defined(writeq)
+       unsigned long flags;
+ #endif
+ 
        u16 hdr_size = le16_to_cpu(fib->hw_fib_va->header.Size);
 +      u16 vector_no;
  
        atomic_inc(&q->numpending);