On Fri, Jan 31, 2014 at 3:24 PM, Andres Freund <and...@2ndquadrant.com> wrote: > I've pushed a rebased version of the patchset to > http://git.postgresql.org/gitweb/?p=users/andresfreund/postgres.git > branch rwlock contention. > 220b34331f77effdb46798ddd7cca0cffc1b2858 actually was the small problem, > ea9df812d8502fff74e7bc37d61bdc7d66d77a7f was the major PITA.
As per discussion in developer meeting, I wanted to test shared buffer scaling patch with this branch. I am getting merge conflicts as per HEAD. Could you please get it resolved, so that I can get the data. >From git://git.postgresql.org/git/users/andresfreund/postgres * branch rwlock-contention -> FETCH_HEAD Auto-merging src/test/regress/regress.c CONFLICT (content): Merge conflict in src/test/regress/regress.c Auto-merging src/include/storage/proc.h Auto-merging src/include/storage/lwlock.h CONFLICT (content): Merge conflict in src/include/storage/lwlock.h Auto-merging src/include/storage/ipc.h CONFLICT (content): Merge conflict in src/include/storage/ipc.h Auto-merging src/include/storage/barrier.h CONFLICT (content): Merge conflict in src/include/storage/barrier.h Auto-merging src/include/pg_config_manual.h Auto-merging src/include/c.h Auto-merging src/backend/storage/lmgr/spin.c Auto-merging src/backend/storage/lmgr/proc.c Auto-merging src/backend/storage/lmgr/lwlock.c CONFLICT (content): Merge conflict in src/backend/storage/lmgr/lwlock.c Auto-merging src/backend/storage/ipc/shmem.c Auto-merging src/backend/storage/ipc/ipci.c Auto-merging src/backend/access/transam/xlog.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c Auto-merging src/backend/access/transam/twophase.c Auto-merging configure.in Auto-merging configure Auto-merging config/c-compiler.m4 Automatic merge failed; fix conflicts and then commit the result. With Regards, Amit Kapila. EnterpriseDB: http://www.enterprisedb.com
