Hi Neel, Attached is the patches.
Best Regards, Hung Nguyen DEK Technologies ------------------------------------------------------------------------ *From:* Reddy Neelakanta Reddy Peddavandla *Sent:* Wednesday, March 18, 2015 4:37PM *To:* Hung Nguyen, Anders Bjornerstedt *Cc:* opensaf-devel*Subject:* Re: [PATCH 0 of 2] Review Request for imm: Fix upgrade problem introduced by enhancement #969 [#1267]
Hi Hung, Not able to apply the patches. patching file osaf/libs/agents/saf/imma/imma_oi_api.c Hunk #1 FAILED at 3621. Hunk #2 FAILED at 3744. Hunk #3 FAILED at 3870.3 out of 3 hunks FAILED -- saving rejects to file osaf/libs/agents/saf/imma/imma_oi_api.c.rej
patching file osaf/libs/agents/saf/imma/imma_proc.cpatch: **** malformed patch at line 59: ccbObjDelRpl.info.immnd.info.ccbUpcallRsp.oi_client_hdl = callback->lcl_imm_hdl;
tried to corretc the patch 1, and for patch 2 did not apply, patching file osaf/libs/agents/saf/imma/imma_oi_api.c Hunk #1 FAILED at 3621. Hunk #2 FAILED at 3741. Hunk #3 succeeded at 3879 with fuzz 2 (offset 1 line).2 out of 3 hunks FAILED -- saving rejects to file osaf/libs/agents/saf/imma/imma_oi_api.c.rej
patching file osaf/libs/agents/saf/imma/imma_proc.cpatch: **** malformed patch at line 72: ccbObjDelRpl.info.immnd.info.ccbUpcallRsp.result = localEr;
Please, provide the patch that can be applied on 4.6 On Tuesday 17 March 2015 06:12 PM, Hung Nguyen wrote:
Summary: imm: Fix upgrade problem introduced by enhancement #969 [#1267] Review request for Trac Ticket(s): 1267 Peer Reviewer(s): Anders, Neelakanta Pull request to: Affected branch(es): default(4.7), 4.6 Development branch: default(4.7) -------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts n SAF services n OpenSAF services y Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- changeset 9aee43d9d2476b07993c81c16fa0592835dea2c5 Author: Hung Nguyen <[email protected]> Date: Tue, 17 Mar 2015 09:23:22 +0700 imm: Revert the change on IMMSV_OI_CCB_UPCALL_RSP in #969 [#1267] Revert the change on IMMSV_OI_CCB_UPCALL_RSP in #969 changeset a272783ca3d677e55860d634bd6bb0553491af51 Author: Hung Nguyen <[email protected]> Date: Tue, 17 Mar 2015 18:55:01 +0700 imm: Remove use of SaNameT from IMMSV_OI_CCB_UPCALL_RSP [#1267]Replace SaNameT with IMMSV_OCTET_STRING. Introduce new message types: IMMND_EVT_A2ND_CCB_OBJ_DELETE_RSP_3, IMMND_EVT_A2ND_CCB_OBJ_DELETE_RSP_4, IMMND_EVT_A2ND_OI_CCB_AUG_INIT_2. Add encoding/decoding for new message types. SaNameT is converted to IMMSV_OCTET_STRING when decoding old-typed messages. New-typed messages are only forwarded to IMMD when protocol46 is enabled. When protocol46 is disabled, the messages are converted to the old type before forwarding to IMMD, this is done in immnd_fevs_local_checks().Complete diffstat: ------------------ osaf/libs/agents/saf/imma/imma_oi_api.c | 9 ++---- osaf/libs/agents/saf/imma/imma_proc.c | 6 ++--osaf/libs/common/immsv/immsv_evt.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------osaf/libs/common/immsv/include/immsv_evt.h | 4 +++ osaf/libs/common/immsv/include/immsv_evt_model.h | 5 +++- osaf/services/saf/immsv/immnd/ImmModel.cc | 4 +-osaf/services/saf/immsv/immnd/immnd_evt.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------7 files changed, 259 insertions(+), 53 deletions(-) Testing Commands: ----------------- Testing, Expected Results: -------------------------- Conditions of Submission: ------------------------- Ack from reviewers. Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 n n powerpc n n powerpc64 n n Reviewer Checklist: ------------------- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries):___ Your RR template is generally incomplete; it has too many blank entriesthat need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable.___ You have exceeded a sensible line length in your headers/comments/text.___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single commit. ___ You have extraneous garbage in your review (merge commits etc) ___ You have giant attachments which should never have been sent; Instead you should place your content in a public tree to be pulled. ___ You have too many commits attached to an e-mail; resend as threaded commits, or place in a public tree for a pull.___ You have resent this content multiple times without a clear indicationof what has changed between each re-send. ___ You have failed to adequately and individually address all of thecomments and change requests that were proposed in the initial review.___ You have a misconfigured ~/.hgrc file (i.e. username, email etc) ___ Your computer have a badly configured date and time; confusing the the threaded patch review. ___ Your changes affect IPC mechanism, and you don't present any results for in-service upgradability test. ___ Your changes affect user manual and documentation, your patch series do not contain the patch that updates the Doxygen manual.
osaf1267.tar.gz
Description: GNU Zip compressed data
------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
