From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 3 May 2016 08:01:52 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.7-rc1~168^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6dd4c83ed7e28309c03b0c267f1473fc3e7db9f1;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in the qat adf_init_pf_wq fix.
---

6dd4c83ed7e28309c03b0c267f1473fc3e7db9f1
diff --cc drivers/crypto/qat/qat_common/adf_common_drv.h
index ff0b37bed8c1,976b01e58afb..35ffa940989b
--- a/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
@@@ -144,10 -144,6 +144,8 @@@ void adf_disable_aer(struct adf_accel_d
  void adf_dev_restore(struct adf_accel_dev *accel_dev);
  int adf_init_aer(void);
  void adf_exit_aer(void);
 +int adf_init_vf_wq(void);
 +void adf_exit_vf_wq(void);
- int adf_init_pf_wq(void);
- void adf_exit_pf_wq(void);
  int adf_init_admin_comms(struct adf_accel_dev *accel_dev);
  void adf_exit_admin_comms(struct adf_accel_dev *accel_dev);
  int adf_send_admin_init(struct adf_accel_dev *accel_dev);
@@@ -240,9 -236,8 +238,11 @@@ void adf_enable_vf2pf_interrupts(struc
  				 uint32_t vf_mask);
  void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);
  void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);
 +
 +int adf_vf2pf_init(struct adf_accel_dev *accel_dev);
 +void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev);
+ int adf_init_pf_wq(void);
+ void adf_exit_pf_wq(void);
  #else
  static inline int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
  {
@@@ -261,13 -256,13 +261,22 @@@ static inline void adf_disable_pf2vf_in
  {
  }
  
 +static inline int adf_vf2pf_init(struct adf_accel_dev *accel_dev)
 +{
 +	return 0;
 +}
 +
 +static inline void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev)
 +{
 +}
++
+ static inline int adf_init_pf_wq(void)
+ {
+ 	return 0;
+ }
+ 
+ static inline void adf_exit_pf_wq(void)
+ {
+ }
  #endif
  #endif