FYI, I've just committed these: [PATCH 1/2] remove all trailing blanks [PATCH 2/2] remove empty lines at end-of-file
If you have any problems merging, it's often enough just to remove all trailing blanks from your patch and apply that to the post-TB-removal tree. >From 1dd0acc01f554a32ad38d7e026b9d2f3277c5ebf Mon Sep 17 00:00:00 2001 From: meyering <meyer...@fd59a12c-fef9-0310-b244-a6a79926bd2f> Date: Wed, 22 Apr 2009 08:03:55 +0000 Subject: [PATCH 1/2] remove all trailing blanks git-svn-id: svn+ssh://svn.fedorahosted.org/svn/corosync/tr...@2117 fd59a12c-fef9-0310-b244-a6a79926bd2f --- Doxyfile | 60 ++++++++++---------- LICENSE | 2 +- Makefile.am | 6 +- README.devmap | 22 ++++---- README.recovery | 2 +- SECURITY | 8 ++-- autogen.sh | 18 +++--- exec/Makefile.am | 6 +- exec/coroipcs.c | 46 ++++++++-------- exec/coropoll.c | 18 +++--- exec/crypto.c | 58 ++++++++++---------- exec/crypto.h | 10 ++-- exec/logsys.c | 22 ++++---- exec/main.c | 26 +++++----- exec/mainconfig.h | 2 +- exec/mempool.c | 8 ++-- exec/mempool.h | 2 +- exec/service.c | 16 +++--- exec/sync.c | 2 +- exec/tlist.h | 10 ++-- exec/totemconfig.h | 4 +- exec/totemnet.c | 66 +++++++++++----------- exec/totemnet.h | 2 +- exec/totempg.c | 64 +++++++++++----------- exec/totemrrp.c | 56 ++++++++++---------- exec/totemsrp.c | 108 ++++++++++++++++++------------------ exec/util.c | 6 +- exec/vsf.h | 2 +- exec/vsf_ykd.c | 12 ++-- exec/wthread.c | 4 +- exec/wthread.h | 2 +- include/Makefile.am | 8 ++-- include/corosync/cfg.h | 2 +- include/corosync/coroipcc.h | 2 +- include/corosync/corotypes.h | 2 +- include/corosync/engine/config.h | 2 +- include/corosync/engine/logsys.h | 2 +- include/corosync/engine/objdb.h | 4 +- include/corosync/hdb.h | 4 +- include/corosync/ipc_cfg.h | 2 +- include/corosync/ipc_evs.h | 2 +- include/corosync/ipc_gen.h | 4 +- include/corosync/ipc_pload.h | 2 +- include/corosync/lcr/lcr_ifact.h | 2 +- include/corosync/pload.h | 2 +- include/corosync/swab.h | 2 +- include/corosync/totem/coropoll.h | 2 +- init/generic | 12 ++-- init/mvlcge | 8 ++-- lcr/Makefile.am | 6 +- lcr/README.lcr | 4 +- lcr/lcr_ifact.c | 6 +- lcr/libtest_a.c | 2 +- lcr/libtest_b.c | 2 +- lcr/test.c | 2 +- lcr/uic.c | 4 +- lcr/uis.c | 8 ++-- lib/Makefile.am | 8 ++-- lib/coroipcc.c | 46 ++++++++-------- lib/evs.c | 18 +++--- lib/libcfg.versions | 4 +- lib/libquorum.versions | 2 +- lib/libvotequorum.versions | 2 +- lib/pload.c | 6 +- lib/util.h | 4 +- man/Makefile.am | 8 ++-- man/confdb_dispatch.3 | 16 +++--- man/confdb_fd_get.3 | 14 +++--- man/confdb_finalize.3 | 14 +++--- man/confdb_initialize.3 | 6 +- man/confdb_key_create.3 | 14 +++--- man/confdb_key_delete.3 | 14 +++--- man/confdb_key_iter.3 | 18 +++--- man/confdb_key_replace.3 | 16 +++--- man/confdb_object_create.3 | 18 +++--- man/confdb_object_destroy.3 | 26 +++++----- man/confdb_object_find.3 | 22 ++++---- man/confdb_object_iter.3 | 18 +++--- man/confdb_object_parent_get.3 | 16 +++--- man/confdb_overview.8 | 14 +++--- man/coroipc_overview.8 | 6 +- man/corosync-objctl.8 | 2 +- man/corosync.conf.5 | 44 ++++++++-------- man/corosync_overview.8 | 8 ++-- man/cpg_context_get.3 | 2 +- man/cpg_context_set.3 | 2 +- man/cpg_dispatch.3 | 4 +- man/cpg_fd_get.3 | 2 +- man/cpg_finalize.3 | 2 +- man/cpg_initialize.3 | 6 +- man/cpg_join.3 | 8 ++-- man/cpg_leave.3 | 4 +- man/cpg_local_get.3 | 4 +- man/cpg_mcast_joined.3 | 6 +- man/cpg_membership_get.3 | 4 +- man/cpg_overview.8 | 2 +- man/cpg_zcb_alloc.3 | 2 +- man/cpg_zcb_free.3 | 2 +- man/cpg_zcb_mcast_joined.3 | 6 +- man/evs_dispatch.3 | 4 +- man/evs_fd_get.3 | 2 +- man/evs_finalize.3 | 2 +- man/evs_initialize.3 | 6 +- man/evs_join.3 | 2 +- man/evs_leave.3 | 4 +- man/evs_mcast_groups.3 | 6 +- man/evs_mcast_joined.3 | 6 +- man/evs_membership_get.3 | 4 +- man/evs_overview.8 | 4 +- man/index.html | 10 ++-- man/logsys_overview.8 | 8 ++-- man/votequorum_dispatch.3 | 4 +- man/votequorum_fd_get.3 | 2 +- man/votequorum_finalize.3 | 2 +- man/votequorum_getinfo.3 | 4 +- man/votequorum_initialize.3 | 6 +- man/votequorum_leaving.3 | 4 +- man/votequorum_overview.8 | 8 ++-- man/votequorum_qdisk_getinfo.3 | 2 +- man/votequorum_qdisk_poll.3 | 8 ++-- man/votequorum_qdisk_register.3 | 4 +- man/votequorum_qdisk_unregister.3 | 2 +- man/votequorum_setexpected.3 | 2 +- man/votequorum_setvotes.3 | 4 +- pkgconfig/Makefile.am | 8 ++-- services/Makefile.am | 6 +- test/Makefile.am | 6 +- test/logsys_s.c | 2 +- test/logsys_s1.c | 2 +- test/logsys_s2.c | 2 +- test/logsys_t1.c | 4 +- test/logsys_t2.c | 2 +- test/logsysrec.c | 2 +- test/sa_error.c | 4 +- test/testevsth.c | 2 +- test/testmake.sh | 2 +- test/testparse.c | 4 +- test/testtimer.c | 4 +- tools/Makefile.am | 8 ++-- tools/corosync-pload.c | 4 +- 140 files changed, 690 insertions(+), 690 deletions(-) >From c9f3fd591fe1be87558f2d9a4c546ce845d3d989 Mon Sep 17 00:00:00 2001 From: meyering <meyer...@fd59a12c-fef9-0310-b244-a6a79926bd2f> Date: Wed, 22 Apr 2009 08:04:06 +0000 Subject: [PATCH 2/2] remove empty lines at end-of-file git-svn-id: svn+ssh://svn.fedorahosted.org/svn/corosync/tr...@2118 fd59a12c-fef9-0310-b244-a6a79926bd2f --- LICENSE | 2 -- exec/apidef.h | 1 - exec/crypto.c | 1 - include/Makefile.am | 2 -- include/corosync/corotypes.h | 1 - init/mvlcge | 2 -- lcr/Makefile.am | 2 -- lcr/libtest_a.c | 1 - lib/Makefile.am | 2 -- lib/util.h | 1 - man/coroipc_overview.8 | 1 - man/index.html | 1 - services/Makefile.am | 2 -- tools/Makefile.am | 3 --- 14 files changed, 0 insertions(+), 22 deletions(-) _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
