Comment 4 for bug 1786902

These do not apply cleanly for me. I don't see git getting confused about deletions, rather I see that we have two or more branches which have merged and have conflicting changes, which doesn't make for easy cherry picks. I'll try to resolve this, but in the mean time I have a couple of questions.

When I do 'git log v4.18..master net/smc' using Linus' master at the moment (050cdc6c9501abcd64720b8cc3e7941efee9547d) and compare to the list here, I notice a couple of things. First there's one commit that is missing (ignoring merges):

e82f2e31f559 net/smc: optimize consumer cursor updates

Should this also be cherry picked or is it unnecessary?

The second thing I see is a couple of commits following the ones requested here (ignoring merges):

92f4e77c8591 Revert "net/smc: Replace ib_query_gid with rdma_get_gid_attr"
b4c296f9c964 RDMA/smc: Replace ib_query_gid with rdma_get_gid_attr

Are these also wanted?