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? -- You received this bug notification because you are a member of Kernel Packages, which is subscribed to linux in Ubuntu. https://bugs.launchpad.net/bugs/1786902 Title: [18.10 FEAT] SMC-Direct Status in Ubuntu on IBM z Systems: Triaged Status in linux package in Ubuntu: New Bug description: Provide support for next generation HiperSockets. SMC-local (Shared Memory Communications -- local) provides a new architecture for high performance networking within a CEC. Buffers in the HSA can be shared between LPARs and will be used for communication. A new socket family will be used to eliminate TCP overhead. Integration with existing tooling through TCP handshaking. A preload library can be used to enable applications to use the new socket family transparently Backport from kernel 4.19 will be attached. For SMC enabling following kernel config has to be set CONFIG_HAVE_PNETID. With this setting an additoiponal modul need to be build : pnet.ko @canonical kernel team: please cherrypick: Here you go - sorry for the delay! In sequence, from oldest to latest: ddb457c6993babbcdd41fca638b870d2a2fc3941 be6a3f38ff2a2bfd2e591fdc566940a0d4d9428c 0afff91c6f5ecef27715ea71e34dc2baacba1060 c6ba7c9ba43de1b57e9a53946e7ff988554c84ed 1619f770589a183af56f248de261534b255122de c758dfddc1b5b1c9b8c64e5e4bb9bf24b74f4a59 be244f28d22f77d939ba2b973c102ad2b49d3496 413498440e30bfe381ac99dfc31628a3d8d4382a 4b1b7d3b30a6d32ac1a1dcede284e76ef8a8542d c601171d7a60b5b09d7c2fe0579953323a80744e bac6de7b637018f4caacfdf2b4ad8c8749de7420 00e5fb263f9f5f2af60754b79b7dcec0d5e88154 144ce4b9b5a788953b5373162a1921267497fb38 48bf5231771c7e3961c8326353b6027b1bed6eb5 12c36dcfd6f48ece2fce4dc8e6ce68224d005d37 2e3bbe46b4a18d16314dab0c0efdba0c079a5ed0 947541f36c561b5e0ca639ffc450a8c5221de467 7005ada68d1774d7c1109deaba0c2cd8e46f5091 603cc1498455cf57f5ca4483b600efb37ea2c56c 0d18a0cb4b1585d9e5a3b300d5df9ed866561ffb dd979b4df817e9976f18fb6f9d134d6bc4a3c317 0d86caff06363151df21603eb1f4e3207ea91bd2 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu-z-systems/+bug/1786902/+subscriptions -- Mailing list: https://launchpad.net/~kernel-packages Post to : kernel-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~kernel-packages More help : https://help.launchpad.net/ListHelp
