lkml.org 
[lkml]   [2018]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the mlx5-next tree with the rdma tree
    Hi Leon,

    Today's linux-next merge of the mlx5-next tree got a conflict in:

    drivers/infiniband/hw/mlx5/main.c
    drivers/infiniband/hw/mlx5/mlx5_ib.h

    between commit:

    36e235c88299 ("RDMA/mlx5: Use the uapi disablement APIs instead of code")

    from the rdma tree and commit:

    81773ce5f07f ("RDMA/mlx5: Use stages for callback to setup and release DEVX")

    from the mlx5-next tree.

    I fixed it up (see below) and can carry the fix as necessary. This
    is now fixed as far as linux-next is concerned, but any non trivial
    conflicts should be mentioned to your upstream maintainer when your tree
    is submitted for merging. You may also want to consider cooperating
    with the maintainer of the conflicting tree to minimise any particularly
    complex conflicts.

    --
    Cheers,
    Stephen Rothwell

    diff --cc drivers/infiniband/hw/mlx5/main.c
    index f9078688da5b,96515a8c9d2c..000000000000
    --- a/drivers/infiniband/hw/mlx5/main.c
    +++ b/drivers/infiniband/hw/mlx5/main.c
    @@@ -6231,6 -6336,12 +6321,9 @@@ static const struct mlx5_ib_profile pf_
    STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR,
    NULL,
    mlx5_ib_stage_pre_ib_reg_umr_cleanup),
    - STAGE_CREATE(MLX5_IB_STAGE_SPECS,
    - mlx5_ib_stage_populate_specs,
    - NULL),
    + STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,
    + mlx5_ib_stage_devx_init,
    + mlx5_ib_stage_devx_cleanup),
    STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
    mlx5_ib_stage_ib_reg_init,
    mlx5_ib_stage_ib_reg_cleanup),
    diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
    index a2b35a1a5031,861b68f2e330..000000000000
    --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
    +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
    @@@ -781,6 -784,8 +784,7 @@@ enum mlx5_ib_stages
    MLX5_IB_STAGE_UAR,
    MLX5_IB_STAGE_BFREG,
    MLX5_IB_STAGE_PRE_IB_REG_UMR,
    - MLX5_IB_STAGE_SPECS,
    + MLX5_IB_STAGE_WHITELIST_UID,
    MLX5_IB_STAGE_IB_REG,
    MLX5_IB_STAGE_POST_IB_REG_UMR,
    MLX5_IB_STAGE_DELAY_DROP,
    @@@ -890,7 -896,9 +895,8 @@@ struct mlx5_ib_pf_eq

    struct mlx5_ib_dev {
    struct ib_device ib_dev;
    - const struct uverbs_object_tree_def *driver_trees[7];
    struct mlx5_core_dev *mdev;
    + struct notifier_block mdev_events;
    struct mlx5_roce roce[MLX5_MAX_PORTS];
    int num_ports;
    /* serialize update of capability mask
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2018-12-05 02:07    [W:2.266 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site