From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Mar 2016 22:57:39 +0000 (-0700)
Subject: Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab... 
X-Git-Tag: v4.6-rc1~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed7d6bc23b6dd8f5272431ce930c84d1e537be49;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-next-merge' of git://git./linux/kernel/git/nab/target-pending

Pull more SCSI target updates from Nicholas Bellinger:
 "This series contains cxgb4 driver prerequisites for supporting iscsi
  segmentation offload (ISO), that will be utilized for a number of
  future v4.7 developments in iscsi-target for supporting generic hw
  offloads"

* 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  cxgb4: update Kconfig and Makefile
  cxgb4: add iSCSI DDP page pod manager
  cxgb4, iw_cxgb4: move delayed ack macro definitions
  cxgb4: move VLAN_NONE macro definition
  cxgb4: update struct cxgb4_lld_info definition
  cxgb4: add definitions for iSCSI target ULD
  cxgb4, cxgb4i: move struct cpl_rx_data_ddp definition
  cxgb4, iw_cxgb4, cxgb4i: remove duplicate definitions
  cxgb4, iw_cxgb4: move definitions to common header file
  cxgb4: large receive offload support
  cxgb4: allocate resources for CXGB4_ULD_ISCSIT
  cxgb4: add new ULD type CXGB4_ULD_ISCSIT
---

ed7d6bc23b6dd8f5272431ce930c84d1e537be49
diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 1dac6c6111bf,646076e36bca..984a3cc26f86
--- a/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;