diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2021-10-19 14:09:25 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-10-19 14:09:25 -0300 |
| commit | 71ee1f1275432421307d27dd4df43f33e60456de (patch) | |
| tree | a69e771c98ca332d0872612b61413b7fbd9e2765 /net/dsa/tag_ocelot.c | |
| parent | ac0fffa0859b8e1e991939663b3ebdd80bf979e6 (diff) | |
| parent | ae0579acde812bc1efd074086ae3bc5eae170f20 (diff) | |
Merge brank 'mlx5_mkey' into rdma.git for-next
A small series to clean up the mlx5 mkey code across the mlx5_core and
InfiniBand.
* branch 'mlx5_mkey':
RDMA/mlx5: Attach ndescs to mlx5_ib_mkey
RDMA/mlx5: Move struct mlx5_core_mkey to mlx5_ib
RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key
RDMA/mlx5: Remove pd from struct mlx5_core_mkey
RDMA/mlx5: Remove size from struct mlx5_core_mkey
RDMA/mlx5: Remove iova from struct mlx5_core_mkey
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'net/dsa/tag_ocelot.c')
| -rw-r--r-- | net/dsa/tag_ocelot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c index 8025ed778d33..605b51ca6921 100644 --- a/net/dsa/tag_ocelot.c +++ b/net/dsa/tag_ocelot.c @@ -2,7 +2,6 @@ /* Copyright 2019 NXP */ #include <linux/dsa/ocelot.h> -#include <soc/mscc/ocelot.h> #include "dsa_priv.h" static void ocelot_xmit_common(struct sk_buff *skb, struct net_device *netdev, |