]> www.infradead.org Git - users/willy/pagecache.git/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Mar 2025 01:52:29 +0000 (12:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Mar 2025 01:52:29 +0000 (12:52 +1100)
commitba93f9aa3ac23cbc1137eb32f18f17d6bd8b8454
tree87f8cbe90be07006cea293e2d8546e96b4c17a97
parentb2be24c4be63d7cbd5844763d9982a1b6c584578
parent0a924decd4a3a27c557a6d3c29add61d45ab592a
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

# Conflicts:
# drivers/infiniband/sw/rxe/rxe.c
drivers/infiniband/hw/bnxt_re/bnxt_re.h
drivers/infiniband/hw/mana/main.c
drivers/infiniband/sw/rxe/rxe.c
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
drivers/net/ethernet/microsoft/mana/gdma_main.c