AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:
CFG:
PT:0
S:andy.sharp@lsi.com
RQ:
SSV:mhbs.lsil.com
NSV:
SSH:
R:<Larry.Scheer@lsi.com>
MAID:2
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/LSI/INBOX	0	DEC609CD0E54B2448DAF023C89AE9755E250CEDC@cosmail02.lsi.com
X-Sylpheed-End-Special-Headers: 1
Date: Fri, 18 Sep 2009 16:45:28 -0700
From: Andrew Sharp <andy.sharp@lsi.com>
To: "Scheer, Larry" <Larry.Scheer@lsi.com>
Subject: Re: Please review txrx branch integration change 33313
Message-ID: <20090918164528.182fd6ed@ripper.onstor.net>
In-Reply-To: <DEC609CD0E54B2448DAF023C89AE9755E250CEDC@cosmail02.lsi.com>
References: <DEC609CD0E54B2448DAF023C89AE9755E250CED4@cosmail02.lsi.com>
	<20090917155751.40cb4dee@ripper.onstor.net>
	<DEC609CD0E54B2448DAF023C89AE9755E250CEDC@cosmail02.lsi.com>
Organization: LSI
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

"Go"

On Fri, 18 Sep 2009 17:36:55 -0600 "Scheer, Larry"
<Larry.Scheer@lsi.com> wrote:

> Comments in-line below
> Basically I implemented your header fixes. I think we are good to go.
> ________________________________________
> From: Andrew Sharp [andy.sharp@lsi.com]
> Sent: Thursday, September 17, 2009 3:57 PM
> To: Scheer, Larry
> Subject: Re: Please review txrx branch integration change 33313
> 
> I didn't like the cluster-api.h change, so I did it a bit differently.
> Take a look at the following files in ~andys/larrys-tuxrx/nfx-tree/
> 
> code/sm-dcache/dcache-api.c
> code/sm-dcache/dcache-rx.c
> code/ssc-cluster/clusdb-struct.h
> code/ssc-cluster/cluster-api.h
> code/ssc-cluster/cluster-msg.h
> code/ssc-rmc/rmc_rpc_api.h
> 
> I had to move the structure definition from cluster-msg.h to
> cluster-struct.h, where it really should be.  Let me know what you
> think.
> 
> >> Great! Worked like a charm.  I will use your fixes.
> 
> Here's the review output:
> 
> 
> 
> 
> = Change 33313 by larrys@larrys on 2009/09/10 12:39:14 *pending*
> =
> =       Integrate dev/nfx-tree/...@33312 into tuxrx branch.
> =       27 files were edited after the merge to make integrated
> changes =       compatible with tuxrx code and to fix compile
> problems. =       Reviewed by:
> =
> 
> nfx-tree/Includes/bc/nfx-defs.h
> 
>      looks good
> 
> nfx-tree/Includes/cg/nfx-defs.h
> 
>      looks good
> 
> nfx-tree/Includes/eee/rpc/rpc.h
> 
>      looks good
> 
> nfx-tree/Includes/nfx-ports.h
> 
>      looks good
> 
> nfx-tree/Includes/opt-msgs.h
> 
>      looks good
> 
> nfx-tree/Makefile
> 
>      looks good
> 
> nfx-tree/Makefile.fc
> 
>      looks good
> 
> nfx-tree/Makefile.fp
> 
>      looks good
> 
> nfx-tree/Soak/start-dataset-g12r9-vs1-vol3.sh
> 
>      >>branch nfx-tree/Soak/start-dataset-g12r9-vs1-vol3.sh
> 
> nfx-tree/Soak/start-g8r9-vs1-vol1-dataset.sh
> 
>      >>branch nfx-tree/Soak/start-g8r9-vs1-vol1-dataset.sh
> 
> nfx-tree/Soak/start-stress-g2r9-vs1-vol1.sh
> 
>      >>branch nfx-tree/Soak/start-stress-g2r9-vs1-vol1.sh
> 
> nfx-tree/Soak/start-stress-g2r9-vs1-vol2.sh
> 
>      >>branch nfx-tree/Soak/start-stress-g2r9-vs1-vol2.sh
> 
> nfx-tree/Soak/start-stress-g2r9-vs2-vol2.sh
> 
>      >>branch nfx-tree/Soak/start-stress-g2r9-vs2-vol2.sh
> 
> nfx-tree/Tools/deb-pkg.mk
> 
>      >>branch nfx-tree/Tools/deb-pkg.mk
> 
> nfx-tree/Tools/defs.mk
> 
>      looks good
> 
> nfx-tree/Tools/depend.mk
> 
>      >>delete nfx-tree/Tools/depend.mk
> 
> nfx-tree/Tools/export.mk
> 
>      >>delete nfx-tree/Tools/export.mk
> 
> nfx-tree/Tools/init-fc.mk
> 
>      looks good
> 
> nfx-tree/Tools/init-fp.mk
> 
>      looks good
> 
> nfx-tree/Tools/init-local.mk
> 
>      looks good
> 
> nfx-tree/Tools/init-mgmt.mk
> 
>      >>delete nfx-tree/Tools/init-mgmt.mk
> 
> nfx-tree/Tools/init-ssc.mk
> 
>      looks good
> 
> nfx-tree/Tools/init-txrx.mk
> 
>      looks good
> 
> nfx-tree/Tools/lib.mk
> 
>      >>delete nfx-tree/Tools/lib.mk
> 
> nfx-tree/Tools/module.mk
> 
>      >>delete nfx-tree/Tools/module.mk
> 
> nfx-tree/Tools/prog.mk
> 
>      >>delete nfx-tree/Tools/prog.mk
> 
> nfx-tree/Tools/rpm-pkg.mk
> 
>      >>branch nfx-tree/Tools/rpm-pkg.mk
> 
> nfx-tree/Tools/suffix.mk
> 
>      looks good
> 
> nfx-tree/Tools/tool-chain-pkg.mk
> 
>      looks good
> 
> nfx-tree/Tools/version
> 
>      looks good
> 
> nfx-tree/Tools/version-bc
> 
>      looks good
> 
> nfx-tree/Tools/version-bl
> 
>      looks good
> 
> nfx-tree/Tools/version-cg
> 
>      looks good
> 
> nfx-tree/Tools/version-ch
> 
>      >>delete nfx-tree/Tools/version-ch
> 
> nfx-tree/code/sm-anpssc/Makefile
> 
>      looks good
> 
> nfx-tree/code/sm-audit/audit-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-audit/audit-msg.c
> 
>      looks good
> 
> nfx-tree/code/sm-audit/audit-struct.h
> 
>      looks good
> 
> nfx-tree/code/sm-audit/audit.c
> 
>      looks good
> 
> nfx-tree/code/sm-authorization/auth-rpc.c
> 
>      looks good
> 
> nfx-tree/code/sm-authorization/author-cifs.c
> 
>      line 23 please use <anglee-brackets>, but please test the build
>      without this include (comment it out) to see if it's actually
>      necessary, unless you added it because you felt it was necessary.
> >> Added the <> brackets. Turns out this include file is not needed I
> >> commented it out.
> 
> nfx-tree/code/sm-authorization/author-cifs.h
> 
>      line 26, do we know if this header file is actually necessary?
> >> looks like it is necessary, compile errors without it
> 
> nfx-tree/code/sm-authorization/author-sec.c
> 
>      line 24, do we know if this header is actually necessary?  this
> is a header the includes about 27 other headers
> >> not needed,  built fine without this file this include is now
> >> commented out.
> 
> nfx-tree/code/sm-authorization/author-sec.h
> 
>      something funky going on here, i can't get a diff of this one,
>      even though i think i already reviewed it.
> >> No diff because the file is now the same as the previous version.
> >> The merge was just a glaring typo which I removed.
> 
> nfx-tree/code/sm-authorization/author-ssc.c
> 
>      looks good
> 
> nfx-tree/code/sm-authorization/author-stats.h
> 
>      looks good
> 
> nfx-tree/code/sm-authorization/author-struct.h
> 
>      looks good
> 
> nfx-tree/code/sm-authorization/author.c
> 
>      line 31, make sure these headers are actually required
> >> Not needed, commented out include
> 
> nfx-tree/code/sm-cache/cache-sibyte.c
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/chassis-ui.c
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/chassisd-bc.c
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/chassisd-msg.c
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/cm-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/cm-bmfpga.c
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/cm-init.c
> 
>      looks good
> 
> nfx-tree/code/sm-chassis/cm-ui.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs-rpc/cifs-rpc-ed-hdr.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs-rpc/cifs-rpc-macros.h
> 
>      looks good
> 
> nfx-tree/code/sm-cifs-rpc/cifs-rpc-srvsvc.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs-rpc/pipe-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-csn.c
> 
>      line 25 should be anglee-brackets
> >> Fixed.
>      line 32, are we positive this header (from hell) is required?
> >> commented it out; builds without it.
> 
> nfx-tree/code/sm-cifs/cifs-ctc.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-req-struct.h
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-req.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-search.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-sess-setup.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-smb-common.c
> 
>      line 24, same old song
> >> commented it out; builds without it.
> 
> nfx-tree/code/sm-cifs/cifs-smb-common.h
> 
>      argh, couldn't these boner-heads put these somewhere else?
>      nothing we can do i guess.
> >> agree, not worth the extra effort to do anything else at this time.
> 
> nfx-tree/code/sm-cifs/cifs-smb-linkrename.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-tcon.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cifs-trans-util.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/cs-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-cifs/secblob.h
> 
>      looks good
> 
> nfx-tree/code/sm-dcache/dcache-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-dcache/dcache-invalidate.c
> 
>      looks good
> 
> nfx-tree/code/sm-dcache/dcache-rx.c
> 
>      hmm, seems like this shouldn't have been necessary, unless they
>      changed these header files in a stupid way. [i think i fixed it]
> >> yes, you fixed it.
> 
> nfx-tree/code/sm-ea/ea-cfgd-rx.c
> 
>      looks good
> 
> nfx-tree/code/sm-ea/ea-cfgd.c
> 
>      looks good
> 
> nfx-tree/code/sm-ea/ea-fs.c
> 
>      looks good
> 
> nfx-tree/code/sm-ea/ea-nis.c
> 
>      looks good
> 
> nfx-tree/code/sm-eee/eee-desc.c
> 
>      looks good
> 
> nfx-tree/code/sm-eee/eee-inlines.h
> 
>      looks good
> 
> nfx-tree/code/sm-esm/esm-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-esm/esm-nfx.c
> 
>      looks good
> 
> nfx-tree/code/sm-esm/esm.c
> 
>      looks good
> 
> nfx-tree/code/sm-esm/esm.h
> 
>      looks good
> 
> nfx-tree/code/sm-event/asd.c
> 
>      looks good
> 
> nfx-tree/code/sm-event/emrs-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-event/event-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-event/event-as.c
> 
>      looks good
> 
> nfx-tree/code/sm-event/event-common.c
> 
>      looks good
> 
> nfx-tree/code/sm-event/event-mgr.c
> 
>      looks good
> 
> nfx-tree/code/sm-event/event.c
> 
>      looks good
> 
> nfx-tree/code/sm-except/crash-halt.c
> 
>      looks good
> 
> nfx-tree/code/sm-except/crashdump-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-file/file-buf-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-file/file-lib.c
> 
>      looks good
> 
> nfx-tree/code/sm-file/file-msg.h
> 
>      looks good
> 
> nfx-tree/code/sm-file/file-server.c
> 
>      looks good
> 
> nfx-tree/code/sm-file/filesh.c
> 
>      looks good
> 
> nfx-tree/code/sm-gns/gns-api.c
> 
>      line 31, probably not needed
> >> Yup, not needed... commented out
> 
> nfx-tree/code/sm-gns/gns-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-gns/gns-struct.h
> 
>      looks good
> 
> nfx-tree/code/sm-ipm/ipm.h
> 
>      looks good
> 
> nfx-tree/code/sm-ipmd-lib/ipmd-lib.c
> 
>      f-me, looks like a formatting change was done
> 
> nfx-tree/code/sm-ipmd/ipmd.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-audit-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-cmd.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-dupcache.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-module.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-monitor-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-proc.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-string.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/nfs-test.c
> 
>      >>delete nfx-tree/code/sm-nfs/nfs-test.c
> 
> nfx-tree/code/sm-nfs/nfs-testprog.c
> 
>      >>delete nfx-tree/code/sm-nfs/nfs-testprog.c
> 
> nfx-tree/code/sm-nfs/ns-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/ns-struct.h
> 
>      looks good
> 
> nfx-tree/code/sm-nfs/rpc.c
> 
>      looks good
> 
> nfx-tree/code/sm-open/fcb-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-open/fns-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-open/ofh-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-open/open-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-open/vcb-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-open/vcb-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-pkt/pkt-queue-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-pkt/pkt.h
> 
>      looks good
> 
> nfx-tree/code/sm-queue/queue-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-ref/ref-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-ref/ref-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-req-queue/req-queue-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-req-queue/req-queue-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-req-queue/req-tbl.def
> 
>      looks good
> 
> nfx-tree/code/sm-req-queue/req-test.c
> 
>      looks good
> 
> nfx-tree/code/sm-req-queue/req-test.h
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc.c
> 
>      line 1506, this doesn't look right, unless RMC_BASE_TIMEOUT
> changed its units, which it didn't.  tuxrx doesn't compile the files
> in this directory anyway.
> >> Since it doesn't matter I will leave it as is to simplify future
> >> mereges.
> 
> 
> 
> nfx-tree/code/sm-rmc/rmc_api.c
> 
>      line 1276, this should stay eee_msToRTC()
> >> Not changing per previous conversation
> 
>      line 1650, ditto
> >> ditto
> 
> 
> 
> nfx-tree/code/sm-rmc/rmc_common.h
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc_debug.c
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc_eee.h
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc_eee_api.h
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc_pm.c
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc_rpc_eee.c
> 
>      looks good
> 
> nfx-tree/code/sm-rmc/rmc_tpl.c
> 
>      line 529, this should stay eee_msToRTC()
> >> Not changing per previous conversation
> 
> nfx-tree/code/sm-rmc/rmc_util.c
> 
>      looks good
> 
> nfx-tree/code/sm-sanm-agent/sanm-agent-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-sanm-agent/sanm-agent-msg.c
> 
>      looks good
> 
> nfx-tree/code/sm-sanm-agent/sanm-agent-private.h
> 
>      looks good
> 
> nfx-tree/code/sm-sanm-agent/sanm-agent-sm-funcs.c
> 
>      looks good
> 
> nfx-tree/code/sm-sanm-agent/sanm-agent-util.c
> 
>      looks good
> 
> nfx-tree/code/sm-sanm-agent/sanm-dmip-funcs.c
> 
>      looks good
> 
> nfx-tree/code/sm-sb1250-prof/Makefile
> 
>      looks good
> 
> nfx-tree/code/sm-search/search-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-simtape/simtape.c
> 
>      #@!$^!#$^! I'm not getting a diff for this file.
> >> For some reason after the integrate their are no differences in
> >> the file. Odd, because unlike the previous file I did not edit
> >> this one after the integrate. There are no difference between dev
> >> and tuxrx and current versus previous version in tuxrx. Perhaps
> >> someone had their client spec set to submitnochange.
> 
> 
> nfx-tree/code/sm-stats/kpi.h
> 
>      looks good
> 
> nfx-tree/code/sm-stats/stats-client.c
> 
>      looks good
> 
> nfx-tree/code/sm-stats/stats-client.h
> 
>      looks good
> 
> nfx-tree/code/sm-tape/tape-cap.c
> 
>      looks good
> 
> nfx-tree/code/sm-test/test-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-test/testsrvr.c
> 
>      looks good
> 
> nfx-tree/code/sm-testdump/testdump-common.c
> 
>      #@^$@#%& also no diff for this friggin file
> >> For some reason after the integrate their are no differences in
> >> the file. Odd, because unlike the previous file I did not edit
> >> this one after the integrate. There are no difference between dev
> >> and tuxrx and current versus previous version in tuxrx. Perhaps
> >> someone had their client spec set to submitnochange.
> 
> nfx-tree/code/sm-testdump/testdump-restore.c
> 
>      12345124tqwefq  ditto, no diff
> >> ditto...
> 
> nfx-tree/code/sm-thread/thread-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-thread/thread-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-tpl-fp/tpl-fp-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-tpl-fp/tpl-fp.c
> 
>      looks good
> 
> nfx-tree/code/sm-tpl/tpl-msg.c
> 
>      looks good
> 
> nfx-tree/code/sm-ui/cmdtable.c
> 
>      looks good
> 
> nfx-tree/code/sm-ui/uihdr.h
> 
>      looks good
> 
> nfx-tree/code/sm-utils/cmd-utils.c
> 
>      looks good
> 
> nfx-tree/code/sm-utils/cron-utils.c
> 
>      looks good
> 
> nfx-tree/code/sm-utils/txrx-utils-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-utils/txrx-utils-api.h
> 
>      looks good
> 
> nfx-tree/code/sm-vscan/vscan-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-vsvr/sfr-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-vsvr/vs-api.c
> 
>      looks good
> 
> nfx-tree/code/sm-vsvr/vs-struct.h
> 
>      looks good
> 
> nfx-tree/code/ssc-authen-lib/authen-lib.c
> 
>      looks good
> 
> nfx-tree/code/ssc-authen-lib/authen-localaccounts-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-authentication/auth-agent.c
> 
>      looks good
> 
> nfx-tree/code/ssc-authentication/auth-cifs.c
> 
>      looks good
> 
> nfx-tree/code/ssc-authentication/auth-nis.c
> 
>      looks good
> 
> nfx-tree/code/ssc-authentication/auth-smbd-api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-authentication/authen-struct.h
> 
>      looks good
> 
> nfx-tree/code/ssc-authentication/privs-struct.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-export-common.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-export-common.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-rec-common.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-rec-common.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-struct.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-tools.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/clusdb-upgrade-common.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-api.h
> 
>      including cluster-msg.h - i'm pretty sure i don't like this.
>      i want to test a couple of things. [i think i fixed it]
> >> Yes you fixed it. Implemented your fix.
> 
> nfx-tree/code/ssc-cluster/cluster-autosupport-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-contrl-cfg.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-contrl-rpc.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-contrl.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-emrs-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-emrs-api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-func.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-gns-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-gns-api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-grp-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-mirror-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-msg.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-rmc.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-rmc.h
> 
>      ew.  but what can you do?
> 
> nfx-tree/code/ssc-cluster/cluster-server-rpc.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-server.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-share-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-share-api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-test.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-util.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-util.h
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-vsvr-api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-cluster/cluster-vsvr-api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-genlib/fs.c
> 
>      looks good
> 
> nfx-tree/code/ssc-mgmt-bus/mgmt-bus.c
> 
>      looks good
> 
> nfx-tree/code/ssc-mgmt-bus/mgmt-bus.h
> 
>      looks good
> 
> nfx-tree/code/ssc-rconlib/rconlib.c
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/Makefile
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc.c
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_client.c
> 
>      >>branch nfx-tree/code/ssc-rmc/rmc_client.c
> 
> nfx-tree/code/ssc-rmc/rmc_pm.c
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_rpc_api.c
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_rpc_api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_rpc_internal.h
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_rpc_ssc.c
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_rpc_ssc.h
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_sim.h
> 
>      >>delete nfx-tree/code/ssc-rmc/rmc_sim.h
> 
> nfx-tree/code/ssc-rmc/rmc_ssc.h
> 
>      looks good
> 
> nfx-tree/code/ssc-rmc/rmc_ssc_api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-sanm/sanm-api.h
> 
>      looks good
> 
> nfx-tree/code/ssc-sanm/sanm-msg.c
> 
>      looks good
> 
> nfx-tree/code/ssc-sanm/sanm-private.h
> 
>      looks good
> 
> nfx-tree/code/ssc-vsd/vs-daemon.c
> 
>      looks good
> 
> nfx-tree/code/ssc-vsd/vs-dbrec.h
> 
>      looks good
> 
> nfx-tree/code/ssc-vsd/vs-util.h
> 
>      looks good
> 
> nfx-tree/code/ssc-vtm/vtm-msg.c
> 
>      looks good
> 
> nfx-tree/code/ssc-vtm/vtm.h
> 
>      looks good
> 
> nfx-tree/target.mk
> 
>      >>delete nfx-tree/target.mk
> 
> 
> 
> 
> 
> On Wed, 16 Sep 2009 13:48:12 -0600 "Scheer, Larry"
> <Larry.Scheer@lsi.com> wrote:
> 
> > Andy,
> >    The branch compiles now. This merge was done in my workspace on
> > mightydog: ~larrys/src/txrx
> >
> > Change 33313 by larrys@larrys on 2009/09/10 12:39:14 *pending*
> >
> >         Integrate dev/nfx-tree/...@33312 into tuxrx branch.
> >         27 files were edited after the merge to make integrated
> > changes compatible with tuxrx code and to fix compile problems.
> >         Reviewed by:
> >
> > Affected files ...
> > There are 6232 files in this change list. 93 files had  nontrivial
> > merges, meaning they did not get merged with a p4 resolve -as
> > (accept save.) There are 27 files that required editing after the
> > merge and 9. I won't bother to list all 6232 files in this email.
> >
> > This file was not changed in the dev branch so no integration was
> > needed however after changes to cluster-api.h However in order to
> > get the build to work I needed to add #include
> > <ssc-cluster/clusdb-struct.h> and comment out #include
> > <ssc-cluster/cluster-msg.h>:
> >
> > //depot/tuxrx/nfx-tree/code/sm-dcache/dcache-rx.c
> >
> > These 26 files, edited after the merge, are the most interesting
> > files to review:
> >
> > //depot/tuxrx/nfx-tree/code/sm-audit/audit-api.h
> > //depot/tuxrx/nfx-tree/code/sm-audit/audit-msg.c
> > //depot/tuxrx/nfx-tree/code/sm-audit/audit.c
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author-cifs.h
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author-sec.c
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-csn.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-smb-common.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-smb-linkrename.c
> > //depot/tuxrx/nfx-tree/code/sm-dcache/dcache-api.c
> > //depot/tuxrx/nfx-tree/code/sm-event/event-common.c
> > //depot/tuxrx/nfx-tree/code/sm-file/file-lib.c
> > //depot/tuxrx/nfx-tree/code/sm-file/file-server.c
> > //depot/tuxrx/nfx-tree/code/sm-gns/gns-api.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/ns-api.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/rpc.c
> > //depot/tuxrx/nfx-tree/code/sm-open/vcb-api.c
> > //depot/tuxrx/nfx-tree/code/sm-queue/queue-api.h
> > //depot/tuxrx/nfx-tree/code/sm-ref/ref-api.c
> > //depot/tuxrx/nfx-tree/code/sm-vscan/vscan-api.c
> > //depot/tuxrx/nfx-tree/code/sm-vsvr/sfr-api.c
> > //depot/tuxrx/nfx-tree/code/ssc-authentication/auth-agent.c
> > //depot/tuxrx/nfx-tree/code/ssc-authentication/authen-struct.h
> > //depot/tuxrx/nfx-tree/code/ssc-authentication/privs-struct.h
> > //depot/tuxrx/nfx-tree/code/ssc-cluster/cluster-api.h
> > //depot/tuxrx/nfx-tree/code/ssc-rmc/rmc_rpc_api.h
> >
> > These 67 files changed in both the dev branch and the tuxrx branch.
> > These required a more careful merge:
> >
> > //depot/tuxrx/nfx-tree/code/sm-audit/audit-struct.h
> > //depot/tuxrx/nfx-tree/code/sm-authorization/auth-rpc.c
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author-cifs.c
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author-sec.h
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author-ssc.c
> > //depot/tuxrx/nfx-tree/code/sm-authorization/author-struct.h
> > //depot/tuxrx/nfx-tree/code/sm-cifs-rpc/cifs-rpc-ed-hdr.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs-rpc/cifs-rpc-srvsvc.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs-rpc/pipe-api.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-ctc.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-req-struct.h
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-req.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-search.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-sess-setup.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-smb-common.h
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-tcon.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cifs-trans-util.c
> > //depot/tuxrx/nfx-tree/code/sm-cifs/cs-api.c
> > //depot/tuxrx/nfx-tree/code/sm-dcache/dcache-invalidate.c
> > //depot/tuxrx/nfx-tree/code/sm-eee/eee-inlines.h
> > //depot/tuxrx/nfx-tree/code/sm-esm/esm-api.h
> > //depot/tuxrx/nfx-tree/code/sm-esm/esm.h
> > //depot/tuxrx/nfx-tree/code/sm-event/event-api.h
> > //depot/tuxrx/nfx-tree/code/sm-event/event-mgr.c
> > //depot/tuxrx/nfx-tree/code/sm-evm/evm-api.h
> > //depot/tuxrx/nfx-tree/code/sm-file/file-buf-api.c
> > //depot/tuxrx/nfx-tree/code/sm-file/file-msg.h
> > //depot/tuxrx/nfx-tree/code/sm-fs/fs-api.h
> > //depot/tuxrx/nfx-tree/code/sm-gns/gns-api.h
> > //depot/tuxrx/nfx-tree/code/sm-gns/gns-struct.h
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-audit-api.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-cmd.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-dupcache.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-module.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-monitor-api.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-proc.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/nfs-string.c
> > //depot/tuxrx/nfx-tree/code/sm-nfs/ns-struct.h
> > //depot/tuxrx/nfx-tree/code/sm-open/fcb-api.h
> > //depot/tuxrx/nfx-tree/code/sm-open/fns-api.h
> > //depot/tuxrx/nfx-tree/code/sm-open/ofh-api.c
> > //depot/tuxrx/nfx-tree/code/sm-open/open-api.c
> > //depot/tuxrx/nfx-tree/code/sm-open/vcb-api.h
> > //depot/tuxrx/nfx-tree/code/sm-ref/ref-api.h
> > //depot/tuxrx/nfx-tree/code/sm-req-queue/req-queue-api.c
> > //depot/tuxrx/nfx-tree/code/sm-req-queue/req-queue-api.h
> > //depot/tuxrx/nfx-tree/code/sm-req-queue/req-tbl.def
> > //depot/tuxrx/nfx-tree/code/sm-rmc/rmc_common.h
> > //depot/tuxrx/nfx-tree/code/sm-rmc/rmc_eee.h
> > //depot/tuxrx/nfx-tree/code/sm-rmc/rmc_eee_api.h
> > //depot/tuxrx/nfx-tree/code/sm-scsi/scsi-msg.h
> > //depot/tuxrx/nfx-tree/code/sm-search/search-api.c
> > //depot/tuxrx/nfx-tree/code/sm-stats/kpi.h
> > //depot/tuxrx/nfx-tree/code/sm-stats/stats-client.c
> > //depot/tuxrx/nfx-tree/code/sm-stats/stats-client.h
> > //depot/tuxrx/nfx-tree/code/sm-thread/thread-api.h
> > //depot/tuxrx/nfx-tree/code/sm-utils/cmd-utils.c
> > //depot/tuxrx/nfx-tree/code/sm-utils/txrx-utils-api.c
> > //depot/tuxrx/nfx-tree/code/sm-utils/txrx-utils-api.h
> > //depot/tuxrx/nfx-tree/code/sm-vsvr/vs-api.c
> > //depot/tuxrx/nfx-tree/code/sm-vsvr/vs-struct.h
> > //depot/tuxrx/nfx-tree/code/ssc-authentication/auth-smbd-api.h
> > //depot/tuxrx/nfx-tree/code/ssc-cluster/clusdb-struct.h
> > //depot/tuxrx/nfx-tree/code/ssc-cluster/cluster-gns-api.h
> > //depot/tuxrx/nfx-tree/code/ssc-cluster/cluster-share-api.h
> > //depot/tuxrx/nfx-tree/code/ssc-sanm/sanm-api.h
> > //depot/tuxrx/nfx-tree/code/ssc-vsd/vs-dbrec.h
