Remove last traces of HPPA support
1 patchset tracked - current t48613_36
v36t48613_36posted Aug 01, 2024successwon't retryancient 2ypg 18
base83aadbeb9 Jul 30, 2024 - 781 days / 6351 commits behind master (from history)
applyapplied Aug 18, 14:47
rebaselast tried Aug 18, 14:47 on 195e8e427
Applying: Standardize macros for detecting architectures. Using index info to reconstruct a base tree... M contrib/pgcrypto/crypt-blowfish.c M src/include/c.h M src/include/port/atomics.h M src/include/port/atomics/arch-x86.h M src/include/port/pg_bitutils.h M src/include/port/simd.h M src/include/storage/s_lock.h M src/port/pg_crc32c_sse42.c Falling back to patching base and 3-way merge... Auto-merging src/port/pg_crc32c_sse42.c Auto-merging src/include/storage/s_lock.h CONFLICT (content): Merge conflict in src/include/storage/s_lock.h Auto-merging src/include/port/simd.h CONFLICT (content): Merge conflict in src/include/port/simd.h Auto-merging src/include/port/pg_bitutils.h CONFLICT (content): Merge conflict in src/include/port/pg_bitutils.h Auto-merging src/include/port/atomics/arch-x86.h CONFLICT (content): Merge conflict in src/include/port/atomics/arch-x86.h Auto-merging src/include/port/atomics.h CONFLICT (content): Merge conflict in src/include/port/atomics.h Auto-merging src/include/c.h Auto-merging contrib/pgcrypto/crypt-blowfish.c Patch failed at 0001 Standardize macros for detecting architectures. 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: src/include/storage/s_lock.h, src/include/port/simd.h, src/include/port/pg_bitutils.h, src/include/port/atomics/arch-x86.h, src/include/port/atomics.h
pushAug 18, 14:47 -> 7bbcf93a8branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 18 | 841 / 841 | 2m 40s / 3m 34s | docker run ... :t48613 | Aug 18, 14:59 |
run 32150503535executed 841 - ccache 76 hit / 6420 miss - head 7bbcf93a8 - digest sha256:4dfa85cba2f15b... - run 32150503535 | ||||||