Merge remote-tracking branch 'target-merge/for-next-merge'

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 1dac6c6111bf1593f2ac0b7ccb0bccc5f6af8bf0,646076e36bca9083e1080d7a82cb3ffc25f8f9f1..984a3cc26f86ddb7a194b4738a3dd7e018b0bc33
--- 1/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
--- 2/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@@ -745,8 -758,9 +763,10 @@@ struct adapter 
        void *uld_handle[CXGB4_ULD_MAX];
        struct list_head list_node;
        struct list_head rcu_node;
 +      struct list_head mac_hlist; /* list of MAC addresses in MPS Hash */
  
+       void *iscsi_ppm;
+ 
        struct tid_info tids;
        void **tid_release_head;
        spinlock_t tid_release_lock;

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
index 961202f4e9aa4a2004f85d89f7a8a638f3898814,a3b939706acb0040400d2f9dc2bb994de8b3dfd8..801b080f7a57f2c19e049abed8a624a678996273
--- 1/drivers/target/iscsi/iscsi_target.c
--- 2/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -4144,10 -4121,10 +4123,10 @@@ static void iscsit_rx_pdu(struct iscsi_
                        ret = rx_data(conn, &iov, 1, ISCSI_CRC_LEN);
                        if (ret != ISCSI_CRC_LEN) {
                                iscsit_rx_thread_wait_for_tcp(conn);
-                               goto transport_err;
+                               return;
                        }
  
 -                      iscsit_do_crypto_hash_buf(&conn->conn_rx_hash,
 +                      iscsit_do_crypto_hash_buf(conn->conn_rx_hash,
                                        buffer, ISCSI_HDR_LEN,
                                        0, NULL, (u8 *)&checksum);
  

diff --cc drivers/target/iscsi/iscsi_target_configfs.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_login.c
Simple merge

diff --cc include/target/iscsi/iscsi_target_core.h
Simple merge