diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-08-25 17:30:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-25 17:30:27 -0700 |
| commit | 9785820e6dba63a26a3640b3faebcfec6ca286cc (patch) | |
| tree | ce0fc8524e7d22459fe3ceea3c91d87c801d19b4 /lib/test_bpf.c | |
| parent | net: make skb an optional parameter for__skb_flow_dissect() (diff) | |
| parent | bnx2x: Fix timesync endianity (diff) | |
| download | linux-dev-9785820e6dba63a26a3640b3faebcfec6ca286cc.tar.xz linux-dev-9785820e6dba63a26a3640b3faebcfec6ca286cc.zip | |
Merge branch 'bnx2x-next'
Yuval Mintz says:
====================
bnx2x: `fixes' patch-series
This series contains mostly bug fixes, but never the less is intended
for `net-next' and not `net', as:
- Some of the fixes are quite insignificant [`VF clean statistics',
`ethtool -d might cause timeout in log'].
- Some only recently were submitted to `net-next' [`Fix timesync endianity'].
- Some are not usually compiled as part of the kernel [`Fix stop-on-error'].
Dave - please consider applying this series to `net-next'; If you prefer,
I can break this series into 2 parts [one for `net' and the other for
`net-next'] - but personally I don't see much benefit in it.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/test_bpf.c')
0 files changed, 0 insertions, 0 deletions