On 06/17/2016 08:33 AM, Leon Romanovsky wrote:
> Hi Doug,
>
> These two patches are intended for rdna-next and related
> to mlx5 only.
>
> Despite the fact that these patches were tested and found
> that no merge conflict is expected between IB and net parts
> of mlx5 driver, we would like to ask you to take into your
> tree this refactored code.
>
> Such move will give us enough time to respond in case other
> developers (non-Mellanox) will send patches in that area and
> will cause to merge conflicts during Linus's merge window.
>
> Thanks
>
> Artemy Kovalyov (2):
> IB/mlx5: Fix MODIFY_QP command input structure
> {net, IB}/mlx5: Refactor internal SRQ API
>
> drivers/infiniband/hw/mlx5/srq.c | 102 ++++------
> drivers/net/ethernet/mellanox/mlx5/core/srq.c | 265 ++++++++++++++------------
> include/linux/mlx5/driver.h | 6 +-
> include/linux/mlx5/qp.h | 5 +-
> include/linux/mlx5/srq.h | 25 +++
> 5 files changed, 218 insertions(+), 185 deletions(-)
>
I had to fix up the fist patch to apply, but the second worked fine.
Series applied for 4.8, thanks.
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
