On Thu, Sep 27, 2018 at 06:01:40PM +0800, Lijun Ou wrote: > This patch series includes bug fixes and a small > feature for hns. > > Lijun Ou (11): > RDMA/hns: Bugfix for reserved qp number > RDMA/hns: Submit bad wr when post send wr exception > RDMA/hns: Bugfix for CM test > RDMA/hns: Limit the size of extend sge of sq > RDMA/hns: Configure ecn field of ip header > RDMA/hns: Update some attributes of the RoCE device > RDMA/hns: Limit extend sq sge num > RDMA/hns: Update some fields of qp context > RDMA/hns: Support local invalidate for hip08 in kernel space > RDMA/hns: Add vlan enable bit for hip08 > RDMA/hns: Bugfix for atomic operation These looked OK, but they don't apply the current tree: Applying: RDMA/hns: Bugfix for reserved qp number Applying: RDMA/hns: Submit bad wr when post send wr exception Applying: RDMA/hns: Bugfix for CM test Applying: RDMA/hns: Limit the size of extend sge of sq Applying: RDMA/hns: Configure ecn field of ip header Applying: RDMA/hns: Update some attributes of the RoCE device Applying: RDMA/hns: Limit extend sq sge num Applying: RDMA/hns: Update some fields of qp context Applying: RDMA/hns: Support local invalidate for hip08 in kernel space Applying: RDMA/hns: Add vlan enable bit for hip08 Applying: RDMA/hns: Bugfix for atomic operation error: sha1 information is lacking or useless (drivers/infiniband/hw/hns/hns_roce_hw_v2.c). error: could not build fake ancestor Patch failed at 0011 RDMA/hns: Bugfix for atomic operation hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please rebase and resend. If you list a git URL in pull requests that exactly matches that git tree that was used to make the git send-email I can resolve trivial rebases myself, but if git am fails I prefer to give up :) Jason
