On Fri, Feb 14, 2020 at 1:47 AM Jason Gunthorpe <jgg@xxxxxxxx> wrote: > > On Thu, Jan 30, 2020 at 01:12:54PM -0500, Devesh Sharma wrote: > > This is the first series out of few more forthcoming series to refactor > > Broadcom's RoCE driver. This series contains patches to refactor control > > path. Since this is first series, there may be few code section which may > > look redundant or overkill but those will be taken care in future patch > > series. > > > > These patches apply clean on tip of for-next branch. > > Each patch in this series is tested against user and kernel functionality. > > These don't apply to for-next, please respin them > > Applying: RDMA/bnxt_re: Refactor queue pair creation code > Applying: RDMA/bnxt_re: Replace chip context structure with pointer > Applying: RDMA/bnxt_re: Refactor hardware queue memory allocation > Applying: RDMA/bnxt_re: Refactor net ring allocation function > Applying: RDMA/bnxt_re: Refactor command queue management code > Using index info to reconstruct a base tree... > M drivers/infiniband/hw/bnxt_re/qplib_rcfw.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/infiniband/hw/bnxt_re/qplib_rcfw.c > CONFLICT (content): Merge conflict in drivers/infiniband/hw/bnxt_re/qplib_rcfw.c > Oops!! okay I let me resolve this conflict and respin the series. Thanks > Thanks, > Jason
