diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-08 12:15:14 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-08 12:15:14 +1100 |
| commit | bb5204c2eb27cc4abed7f7ae3baa9f4388d9302b (patch) | |
| tree | 02aa660747d91848b915c726a64f27a1fd8ebba4 /net/netfilter/nf_conntrack_core.c | |
| parent | 8d19514fade54798106a60059c539501eda31b47 (diff) | |
| parent | cbdba97a0f576cc2d958048ffedbe88948b67e03 (diff) | |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull IB regression fixes from Roland Dreier:
- Fix mlx4 VFs not working on old guests because of 64B CQE changes
- Fix ill-considered sparse fix for qib
- Fix IPoIB crash due to skb double destruct introduced in 3.8-rc1
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/qib: Fix for broken sparse warning fix
mlx4_core: Fix advertisement of wrong PF context behaviour
IPoIB: Fix crash due to skb double destruct
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
0 files changed, 0 insertions, 0 deletions