1
0
Fork 0
alistair23-linux/drivers/net/ethernet/amazon/ena
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
Makefile
ena_admin_defs.h net: ena: add new admin define for future support of IPv6 RSS 2017-10-19 12:51:37 +01:00
ena_com.c net: ena: Fix use of uninitialized DMA address bits field 2018-07-26 21:30:13 -07:00
ena_com.h net: ena: add reset reason for each device FLR 2017-06-23 14:15:09 -04:00
ena_common_defs.h
ena_eth_com.c net: ena: add detection and recovery mechanism for handling missed/misrouted MSI-X 2018-01-02 14:35:12 -05:00
ena_eth_com.h net: ena: Eliminate duplicate barriers on weakly-ordered archs 2018-03-26 12:47:56 -04:00
ena_eth_io_defs.h
ena_ethtool.c treewide: devm_kzalloc() -> devm_kcalloc() 2018-06-12 16:19:22 -07:00
ena_netdev.c net: allow fallback function to pass netdev 2018-07-09 13:57:25 -07:00
ena_netdev.h net: ena: increase ena driver version to 1.5.0 2018-01-02 14:35:12 -05:00
ena_pci_id_tbl.h
ena_regs_defs.h net: ena: add detection and recovery mechanism for handling missed/misrouted MSI-X 2018-01-02 14:35:12 -05:00