diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-12-09 13:15:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 13:15:51 -0500 |
| commit | 6000df00fd440b38cf41d435c3790e9cc12b447f (patch) | |
| tree | a017e63d3e95fee8ad1d98ead741305fcbac07e1 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | fib_trie: Fix /proc/net/fib_trie when CONFIG_IP_MULTIPLE_TABLES is not defined (diff) | |
| parent | amd-xgbe: Associate Tx SKB with proper ring descriptor (diff) | |
| download | linux-dev-6000df00fd440b38cf41d435c3790e9cc12b447f.tar.xz linux-dev-6000df00fd440b38cf41d435c3790e9cc12b447f.zip | |
Merge branch 'amd-xgbe'
Tom Lendacky says:
====================
amd-xgbe: AMD XGBE driver fixes 2014-12-02
The following series of patches includes two bug fixes. Unfortunately,
the first patch will create a conflict when eventually merged into
net-next but should be very easy to resolve.
- Do not clear the interrupt bit in the xgbe_ring_data structure
- Associate a Tx SKB with the proper xgbe_ring_data structure
This patch series is based on net.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions