Shared Memory: How to use SYSV rather than MMAP ?

back to CI dashboard

1 patchset tracked - current t39697_34

v34t39697_34posted Sep 09, 2019successwon't retryancient 7ypg 13
base8e929a466 Sep 08, 2019 - 2568 days / 17722 commits behind master (from history)
applyapplied Aug 18, 16:27
rebaselast tried Aug 18, 16:27 on 195e8e427
Applying: Add huge page support for AIX.
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/port/sysv_shmem.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/port/sysv_shmem.c
Auto-merging doc/src/sgml/config.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/config.sgml
Patch failed at 0001 Add huge page support for AIX.

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: doc/src/sgml/config.sgml
pushAug 18, 16:27 -> 14c6e1b95branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success113544 / 5442m 00s / 2m 47sdocker run ... :t39697Aug 18, 16:35
run 32160423980
executed 544 - ccache 108 hit / 4033 miss - head 14c6e1b95 - digest sha256:56ae02c5a5147c... - run 32160423980