diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 01:57:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 01:57:39 +0300 |
| commit | ed7d6bc23b6dd8f5272431ce930c84d1e537be49 (patch) | |
| tree | e8854bc72e9cfebb7c1570729443c9ca2f9082ca /drivers/net/ethernet/broadcom/genet/bcmgenet.c | |
| parent | c130423620331a104492bbbcc49f25125e26a21a (diff) | |
| parent | 2994a75183173defc21f0d26ce23b63232211b88 (diff) | |
| download | linux-ed7d6bc23b6dd8f5272431ce930c84d1e537be49.tar.xz | |
Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmgenet.c')
0 files changed, 0 insertions, 0 deletions