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 change.

diff --cc drivers/crypto/qat/qat_common/adf_common_drv.h
index 557ea36,1555102..ff0b37b
--- 1/drivers/crypto/qat/qat_common/adf_common_drv.h
--- 2/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
@@@ -144,8 -144,8 +144,10 @@@ 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);

diff --cc drivers/crypto/qat/qat_common/adf_ctl_drv.c
index 116ddda,3c3f948..db21b49
--- 1/drivers/crypto/qat/qat_common/adf_ctl_drv.c
--- 2/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@@ -471,17 -462,17 +471,22 @@@ static int __init adf_register_ctl_devi
        if (adf_init_aer())
                goto err_aer;
  
+       if (adf_init_pf_wq())
+               goto err_pf_wq;
+ 
 +      if (adf_init_vf_wq())
 +              goto err_vf_wq;
 +
        if (qat_crypto_register())
                goto err_crypto_register;
  
        return 0;
  
  err_crypto_register:
 +      adf_exit_vf_wq();
 +err_vf_wq:
+       adf_exit_pf_wq();
+ err_pf_wq:
        adf_exit_aer();
  err_aer:
        adf_chr_drv_destroy();
@@@ -494,7 -485,7 +499,8 @@@ static void __exit adf_unregister_ctl_d
  {
        adf_chr_drv_destroy();
        adf_exit_aer();
 +      adf_exit_vf_wq();
+       adf_exit_pf_wq();
        qat_crypto_unregister();
        adf_clean_vf_map(false);
        mutex_destroy(&adf_ctl_lock);

diff --cc drivers/crypto/qat/qat_common/adf_sriov.c
Simple merge

diff --cc drivers/crypto/talitos.c
Simple merge