[CP #1683 > support/v5.12] [core] zero-copy-zero-payload-shm-transfer

[eclipse-ecal-bot]

Cherry-pick failed

Cherry-picked PR #1683 to branch support/v5.12.
The cherry-pick has failed.

The following files have caused conflicts:

ecal/tests/cpp/pubsub_test/src/pubsub_test_shm.cpp

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/63d1cc2/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/63d1cc2/support/v5.12
git cherry-pick 9b4c0d3447c1cca4a6c328da1962245e21645a2f..63d1cc2f7b996ccb5843e26a10669b9e50f04215

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/63d1cc2/support/v5.12

After resolving all conflicts, rebase-merge this PR.