aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-09 16:30:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-09 16:30:03 -0700
commit1fde76f173e4d9aa205432c2ed5eff978d00deee (patch)
treeae8c0400944bffd7cc1ce9a883784f9482f7a680 /drivers/net
parentMerge branch 'akpm' (patches from Andrew) (diff)
parentIB/rxe: improved debug prints & code cleanup (diff)
downloadlinux-dev-1fde76f173e4d9aa205432c2ed5eff978d00deee.tar.xz
linux-dev-1fde76f173e4d9aa205432c2ed5eff978d00deee.zip
Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma updates from Doug Ledford: "Minor updates for rxe driver" [ Starting to do merge window pulls again - the current -git tree does appear to have some netfilter use-after-free issues, but I've sent off the report to the proper channels, and I don't want to delay merge window activity any more ] * tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: IB/rxe: improved debug prints & code cleanup rdma_rxe: Ensure rdma_rxe init occurs at correct time IB/rxe: Properly honor max IRD value for rd/atomic. IB/{rxe,core,rdmavt}: Fix kernel crash for reg MR IB/rxe: Fix sending out loopback packet on netdev interface. IB/rxe: Avoid scheduling tasklet for userspace QP
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions