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	DEC609CD0E54B2448DAF023C89AE9755E250CED4@cosmail02.lsi.com
X-Sylpheed-End-Special-Headers: 1
Date: Wed, 16 Sep 2009 13:37:19 -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: <20090916133719.293f7749@ripper.onstor.net>
In-Reply-To: <DEC609CD0E54B2448DAF023C89AE9755E250CED4@cosmail02.lsi.com>
References: <DEC609CD0E54B2448DAF023C89AE9755E250CED4@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

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.
  ^  9 what?
> 
> 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

parse error

> 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