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:<Bill.Fisher@lsi.com>,<Larry.Scheer@lsi.com>,<Rendell.Fong@lsi.com>,<Maxim.Kozlovsky@lsi.com>
MAID:2
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/LSI/INBOX	0	4B22C828.9070204@lsi.com
X-Sylpheed-End-Special-Headers: 1
Date: Fri, 11 Dec 2009 17:03:46 -0800
From: Andrew Sharp <andy.sharp@lsi.com>
To: "Fisher, Bill" <Bill.Fisher@lsi.com>
Cc: "Scheer, Larry" <Larry.Scheer@lsi.com>, "Fong, Rendell"
 <Rendell.Fong@lsi.com>, "Kozlovsky, Maxim" <Maxim.Kozlovsky@lsi.com>
Subject: Re: Update... Please review tuxrx merge with dev branch change #
 33753
Message-ID: <20091211170346.204bc472@ripper.onstor.net>
In-Reply-To: <4B22C828.9070204@lsi.com>
References: <DEC609CD0E54B2448DAF023C89AE9755E9275ADB@cosmail02.lsi.com>
	<20091211140908.06dd7579@ripper.onstor.net>
	<4B22C828.9070204@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

Thanks mucho, Bill.  I'm about 80% through the list.  I ignored 99% of
the sm-fs/ and sm-scsi*/ files.  Except for a couple of header files.
I'm going to check if any integrates were done to files that have moved
into the new directories tpl, neteee2, and whatever, you get the idea.
Some of those files are all but obsolete now after your last checkin,
but at least we can track changes that might be needed.

On Fri, 11 Dec 2009 15:31:04 -0700 William Fisher <bill.fisher@lsi.com>
wrote:

> Andrew Sharp wrote:
> > OK, I've winnowed the list down to 300+ files.  PLEASE-Please,
> > everyone *at least* take some time to look at the list and see if
> > there's files on it that you need to take a look at the
> > differences.  If you've made changes to a file for tuxstor, an
> > integrate from the dev branch to that file might be hosing those
> > changes, so please take a look.  Not just the file that Larry
> > edited.
> >
> > I'll be taking a look at the files I care about, like makefiles,
> > header files, and the like.
> >
> > Thanks,
> >
> > a
> >
> > PS I've attached the list.
> >
> >
> > On Wed, 9 Dec 2009 21:21:01 -0700 "Scheer, Larry"
> > <Larry.Scheer@lsi.com> wrote:
> >
> >
> >>I have the SSC, onstor-nas.ko, and both cougar and tuxstor kernel's
> >>building after merging the dev branch into the tuxrx brnach.
> >>
> >>I made an attempt to describe the changes that need some scrutiny in
> >>the change list.
> >>
> >>I needed to edit 44 files after the merge to get everything to
> >>build. I provided the description of the change list below. Below
> >>that  is the list of the 44 files.
> >>
> >>There are 1347 files in this changelist...
> >>
> >>Description:
> >>    Integrate //depot/dev/...@33966 into //depot/tuxrx/...
> >>    Bring tuxrx branch up to date with dev as of Dec 04 2009
> >>
> >>    44 files were opened for edit after the merge. Edits were mostly
> >>    changes to support new E_LOG macros that uses variable
> >> arguments.
> >>
> >>    Post merge edits needing scrutiny by reviewers are:
> >>
> >>    ssc-nfxsh/cmd_lvol.c
> >>    - Line 681: commented out eee_rtcSetCountsPerUsec because
> >>      sm-timer/timer-api.h functionality is moving to a new locaton
> >>
> >>    sm-stats/kpi-api.h
> >>    - Lines 24-64: imported from sm-timer/timer-api.h function:
> >>      eee_rtcSetCountsPerUsec and defines used by it and other
> >>functions. We may want to move this change to the appropriate header
> >>file.
> >>
> >>  sm-sdm/sdm.h
> >>    - updated Jonathan's version of the *_PRT macros to use E_LOG
> >> with varargs.
> >>
> >>    Includes/nfx-types.h
> >>    - Lines 174 -- 180 To resolve conflicts I selected the dev
> >> branch
> >>changes removing defines for SDM_MODEL_NAME_LEN and VENDOR_NAME_LEN.
> >>    - Lines 399 -- 400 added Plane definitions
> >>
> >>    sm-rmc/rmc-common.h
> >>    - Lines 22 -- 23 did not take include of sys/time.h from dev
> >>version.
> >>
> 
>         I have created a net/netrmc directory, which I am compiling
>         now under Linux. I will look at this change.
> 
> >>    sm-cifs/cifs-smb-open.c
> >>    - Lines 368 -- 375 and 427 -- 434, verify these changes are
> >>acceptable.
> >>
> >>    sm-eee/eee-desc.h
> >>    - line 22 removed include of nfx-incl.h
> >>    - added lines 23 -- 27 to conditionally include header files
> >>needed by SSC build.
> >>
> 
>         We talked about this file. We should try and remove
>         the extra "includes" inside of this, like nfx-types.h,
>         since they are required outside and as a minimum to
>         compile any of the TXRX tree.
> 
> >>    sm-utils/cmd-utils.c
> >>    - lots of messing about with includes to get both onstor-nas.ko
> >>plus SSC to build
> >>
> >>    sm-utils/cmd-utils.h for SSC builds
> >>    - line 23 had to add include of sm-scsi/scsi-api.h back into
> >> file
> >>    - line 24 added include of sm-sdm/sdm-api.h
> >>
> >>    For SSC builds the include of sm-libc/libc.h was added to remove
> >>    implicit definition of strlcpy, strlcat, panic, crcChecksum,
> >> etc.
> >>to the following files:
> >>    - ssc-ncm/ncm.c
> >>    - ssc-ncm-lib/ncm-api.c
> >>    - ssc-cluster/cluster-util.c
> >>    - sm-sdm/sdm-init-devcap.c
> >>    - sm-sdm/sdm-init.c
> >>    - sm-fs/fs-primitive.h
> >>
> >>
> >>
> >>
> >>Files I edited after the merge:
> >>
> >>/depot/tuxrx/nfx-tree/Includes/nfx-types.h
> >>//depot/tuxrx/nfx-tree/code/sm-cifs/cifs-read-write.c
> >>//depot/tuxrx/nfx-tree/code/sm-cifs/cifs-smb-open.c
> >>//depot/tuxrx/nfx-tree/code/sm-coredump/coredump.c
> >>//depot/tuxrx/nfx-tree/code/sm-eee/eee-desc.h
> >>//depot/tuxrx/nfx-tree/code/sm-evm/evm-api.h
> >>//depot/tuxrx/nfx-tree/code/sm-evm/evm-cfgd-rx.c
> >>//depot/tuxrx/nfx-tree/code/sm-evm/evm-com-defs.h
> >>//depot/tuxrx/nfx-tree/code/sm-evm/evm-sdm.c
> >>//depot/tuxrx/nfx-tree/code/sm-fs/fs-primitive.h
> >>//depot/tuxrx/nfx-tree/code/sm-fs/fs-rdwr.h
> >>//depot/tuxrx/nfx-tree/code/sm-rmc/rmc_eee.h
> >>//depot/tuxrx/nfx-tree/code/sm-sbm-rev2/sbm-mgmt.c
> >>//depot/tuxrx/nfx-tree/code/sm-scsi/scsi-api.h
> >>//depot/tuxrx/nfx-tree/code/sm-scsi/scsi-msg.c
> >>//depot/tuxrx/nfx-tree/code/sm-scsi/scsi-msg.h
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-init-devcap.c
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-init-disk.c
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-init.c
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-init.h
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-main.c
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-msg.c
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm-verify.c
> >>//depot/tuxrx/nfx-tree/code/sm-sdm/sdm.h
> >>//depot/tuxrx/nfx-tree/code/sm-spm/spm-msg.c
> >>//depot/tuxrx/nfx-tree/code/sm-spm/spm-pool.c
> >>//depot/tuxrx/nfx-tree/code/sm-stats/kpi-api.h
> >>//depot/tuxrx/nfx-tree/code/sm-tape/tape-device.c
> >>//depot/tuxrx/nfx-tree/code/sm-tape/tape-msg.c
> >>//depot/tuxrx/nfx-tree/code/sm-tape/tape-sm.c
> >>//depot/tuxrx/nfx-tree/code/sm-utils/cmd-utils.c
> >>//depot/tuxrx/nfx-tree/code/sm-utils/cmd-utils.h
> >>//depot/tuxrx/nfx-tree/code/sm-vscan/vscan.h
> >>//depot/tuxrx/nfx-tree/code/ssc-cluster/cluster-util.c
> >>//depot/tuxrx/nfx-tree/code/ssc-ncm-lib/ncm-api.c
> >>//depot/tuxrx/nfx-tree/code/ssc-ncm/ncm.c
> >>//depot/tuxrx/nfx-tree/code/ssc-ndmp/ndmp-info.c
> >>//depot/tuxrx/nfx-tree/code/ssc-ndmp/ndmp-scsi.c
> >>//depot/tuxrx/nfx-tree/code/ssc-ndmp/ndmp-tape.c
> >>//depot/tuxrx/nfx-tree/code/ssc-nfxsh/cmd_lvol.c
> >>//depot/tuxrx/nfx-tree/code/ssc-nfxsh/cmd_vol.c
> >>//depot/tuxrx/nfx-tree/code/ssc-rmc/rmc_rpc_api.c
> 
>         I'll look at this since the user level code
>         of RMC, Rendell has been working on and is
>         running. I don't know if this was the
>         directory he was using.
> 
> >>//depot/tuxrx/nfx-tree/code/ssc-tests/pmtest.c
> >>//depot/tuxrx/nfx-tree/code/ssc-vsd/vs-daemon.c
> >>
> >>
> >>------------------------------------------------------------------------
> >>
> >>Makefile#1 integrate
> >>linux/Pkgs/conf/distributions#1 integrate
> >>linux/pkg-tools/mk-binary-repo#1 integrate
> >>linux/pkg-tools/mk-mipsel-deb-rootfs#1 integrate
> >>linux/pkg-tools/new-rootfs.sh#1 integrate
> >>linux/rootfs/etc/init.d/ssh#1 integrate
> >>linux/tools/load_vmlinux.c#2 integrate
> >>nfx-tree/Includes/nfx-types.h#4 edit
> >>nfx-tree/code/sm-chassis/Makefile#2 integrate
> >>nfx-tree/code/sm-chassis/chassis-ui.c#2 integrate
> >>nfx-tree/code/sm-chassis/chassisd-bc.c#3 integrate
> >>nfx-tree/code/sm-chassis/chassisd-cg.c#2 integrate
> >>nfx-tree/code/sm-chassis/chassisd.c#2 integrate
> >>nfx-tree/code/sm-chassis/cm-msg.c#1 integrate
> >>nfx-tree/code/sm-chassis/cm.h#1 integrate
> >>nfx-tree/code/sm-cifs-rpc/cifs-rpc-encdec.c#2 integrate
> >>nfx-tree/code/sm-cifs/cifs-close.c#2 integrate
> >>nfx-tree/code/sm-cifs/cifs-read-write.c#3 edit
> >>nfx-tree/code/sm-cifs/cifs-search.c#4 integrate
> >>nfx-tree/code/sm-cifs/cifs-smb-attributes.c#4 integrate
> >>nfx-tree/code/sm-cifs/cifs-smb-open.c#3 edit
> >>nfx-tree/code/sm-coredump/coredump.c#2 edit
> >>nfx-tree/code/sm-dcache/dcache-api.c#5 integrate
> >>nfx-tree/code/sm-dcache/dcache-inlines.h#4 integrate
> >>nfx-tree/code/sm-dcache/dcache-readdir.c#2 integrate
> >>nfx-tree/code/sm-dcache/dcache-rx.c#4 integrate
> >>nfx-tree/code/sm-dcache/dcache-stats.h#3 integrate
> >>nfx-tree/code/sm-dcache/dcache-tune.c#2 integrate
> >>nfx-tree/code/sm-dcache/dcache-util.c#3 integrate
> >>nfx-tree/code/sm-dp-proxy/dp-proxy-init.c#2 integrate
> >>nfx-tree/code/sm-dp-proxy/dp-proxy.c#4 integrate
> >>nfx-tree/code/sm-ea/ea-cfgd-rx.c#4 edit
> >>nfx-tree/code/sm-ea/ea-evm.c#2 integrate
> >>nfx-tree/code/sm-ea/ea-fs.c#4 integrate
> >>nfx-tree/code/sm-eee/eee-app.h#1 integrate
> >>nfx-tree/code/sm-eee/eee-attr.c#1 integrate
> >>nfx-tree/code/sm-eee/eee-debug.c#1 integrate
> >>nfx-tree/code/sm-eee/eee-debug.h#1 integrate
> >>nfx-tree/code/sm-eee/eee-desc.c#3 integrate
> >>nfx-tree/code/sm-eee/eee-desc.h#2 edit
> >>nfx-tree/code/sm-eee/eee-dvt.c#1 integrate
> >>nfx-tree/code/sm-eee/eee-fwd.c#1 integrate
> >>nfx-tree/code/sm-eee/eee-inlines.h#4 integrate
> >>nfx-tree/code/sm-eee/eee-msg.c#1 integrate
> >>nfx-tree/code/sm-eee/eee-platform.c#1 integrate
> >>nfx-tree/code/sm-eee/eee-shmem.h#1 integrate
> >>nfx-tree/code/sm-eee/eee-test.c#1 integrate
> >>nfx-tree/code/sm-eee/eee.h#1 integrate
> >>nfx-tree/code/sm-elog/elog-embedded.c#2 integrate
> >>nfx-tree/code/sm-event/event-common.c#4 integrate
> >>nfx-tree/code/sm-evm-srvr/evm-api.c#2 integrate
> >>nfx-tree/code/sm-evm-srvr/evm-io.c#3 integrate
> >>nfx-tree/code/sm-evm-srvr/evm-msg.c#2 integrate
> >>nfx-tree/code/sm-evm/evm-api.h#4 edit
> >>nfx-tree/code/sm-evm/evm-cfgd-rx.c#3 edit
> >>nfx-tree/code/sm-evm/evm-cfgd.c#3 integrate
> >>nfx-tree/code/sm-evm/evm-com-defs.h#3 edit
> >>nfx-tree/code/sm-evm/evm-db.c#3 integrate
> >>nfx-tree/code/sm-evm/evm-db.h#1 integrate
> >>nfx-tree/code/sm-evm/evm-sdm.c#2 edit
> >>nfx-tree/code/sm-evm/evm-spm.c#2 edit
> >>nfx-tree/code/sm-evm/evm-util.c#2 edit
> >>nfx-tree/code/sm-file/file-buf-api.c#5 integrate
> >>nfx-tree/code/sm-file/file-lib.c#6 integrate
> >>nfx-tree/code/sm-file/file-server.c#4 integrate
> >>nfx-tree/code/sm-fs/Makefile#2 integrate
> >>nfx-tree/code/sm-fs/btree/btree.c#1 integrate
> >>nfx-tree/code/sm-fs/dump/traverse.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-admin.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-alloc.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-am-api.h#3 integrate
> >>nfx-tree/code/sm-fs/fs-am.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-api.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-api.h#5 edit
> >>nfx-tree/code/sm-fs/fs-arena.c#1 integrate
> >>nfx-tree/code/sm-fs/fs-block-set.c#1 integrate
> >>nfx-tree/code/sm-fs/fs-buf.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-cod-rev2.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-context.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-debug.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-debug.h#2 integrate
> >>nfx-tree/code/sm-fs/fs-dir.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-dnlc.c#1 integrate
> >>nfx-tree/code/sm-fs/fs-dump.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-dump.h#3 integrate
> >>nfx-tree/code/sm-fs/fs-eek.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-eek.h#1 integrate
> >>nfx-tree/code/sm-fs/fs-err.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-global.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-global.h#3 integrate
> >>nfx-tree/code/sm-fs/fs-includes.h#2 integrate
> >>nfx-tree/code/sm-fs/fs-inode.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-io-exer.c#1 integrate
> >>nfx-tree/code/sm-fs/fs-layout.c#1 integrate
> >>nfx-tree/code/sm-fs/fs-layout.h#1 integrate
> >>nfx-tree/code/sm-fs/fs-lock.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-log-replay.c#1 integrate
> >>nfx-tree/code/sm-fs/fs-log.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-log.h#1 integrate
> >>nfx-tree/code/sm-fs/fs-mkfs.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-mkfs.h#1 integrate
> >>nfx-tree/code/sm-fs/fs-mount.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-nfs.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-primitive.h#2 edit
> >>nfx-tree/code/sm-fs/fs-proto.h#3 integrate
> >>nfx-tree/code/sm-fs/fs-quota.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-rdwr.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-rdwr.h#2 edit
> >>nfx-tree/code/sm-fs/fs-restore.c#4 integrate
> >>nfx-tree/code/sm-fs/fs-security.c#2 integrate
> >>nfx-tree/code/sm-fs/fs-shell.c#4 integrate
> >>nfx-tree/code/sm-fs/fs-snap.c#3 integrate
> >>nfx-tree/code/sm-fs/fs-snap.h#2 integrate
> >>nfx-tree/code/sm-fs/fs-super.h#3 integrate
> >>nfx-tree/code/sm-fs/fs-vol-log.c#2 integrate
> >>nfx-tree/code/sm-fs/fsdb-read-block.c#2 edit
> >>nfx-tree/code/sm-fs/fsdb.c#4 integrate
> >>nfx-tree/code/sm-fs/requests.tab#3 integrate
> >>nfx-tree/code/sm-fs/restore/tape.c#3 integrate
> >>nfx-tree/code/sm-fs/restore/utilities.c#3 integrate
> >>nfx-tree/code/sm-fssf/fssf-api.c#1 integrate
> >>nfx-tree/code/sm-gt64440-mii/gt64440mii-diag.c#1 integrate
> >>nfx-tree/code/sm-gt64440-mii/gt64440mii-rx.c#1 integrate
> >>nfx-tree/code/sm-gt64440-mii/gt64440mii-tx.c#1 integrate
> >>nfx-tree/code/sm-linux-socket/socket-drv.c#1 integrate
> >>nfx-tree/code/sm-luc/luc-rx.c#1 integrate
> >>nfx-tree/code/sm-luc/luc-test.c#1 integrate
> >>nfx-tree/code/sm-mgmt-bus/mgmt-bus-emb.c#1 integrate
> >>nfx-tree/code/sm-mgmt-bus/mgmt-bus-unittest.c#1 integrate
> >>nfx-tree/code/sm-ndmp/ndmp-msg.c#3 integrate
> >>nfx-tree/code/sm-ndmp/ndmp-nim-util.c#3 integrate
> >>nfx-tree/code/sm-ndmp/ndmp-test.c#1 integrate
> >>nfx-tree/code/sm-nfs/nfs-cmd-shell.c#2 integrate
> >>nfx-tree/code/sm-nfs/nfs-conn.c#3 integrate
> >>nfx-tree/code/sm-nfs/nfs-parse.c#3 integrate
> >>nfx-tree/code/sm-nfs/nfs-proc.c#5 integrate
> >>nfx-tree/code/sm-nfs/nfs-reply.c#3 integrate
> >>nfx-tree/code/sm-open/fcb-struct.h#2 integrate
> >>nfx-tree/code/sm-prof/prof.c#1 integrate
> >>nfx-tree/code/sm-req-queue/req-tbl.def#4 integrate
> >>nfx-tree/code/sm-req-queue/req-test.c#3 integrate
> >>nfx-tree/code/sm-rmc/rmc.c#3 integrate
> >>nfx-tree/code/sm-rmc/rmc_api.c#4 integrate
> >>nfx-tree/code/sm-rmc/rmc_common.h#6 integrate
> >>nfx-tree/code/sm-rmc/rmc_eee.h#6 edit
> >>nfx-tree/code/sm-rmc/rmc_eee_api.h#3 integrate
> >>nfx-tree/code/sm-rmc/rmc_rpc_eee.c#2 integrate
> >>nfx-tree/code/sm-rmc/rmc_tpl.c#3 integrate
> >>nfx-tree/code/sm-rmc/rmc_util.c#2 integrate
> >>nfx-tree/code/sm-sanm-agent/sanm-agent-api.h#2 integrate
> >>nfx-tree/code/sm-sanm-agent/sanm-agent-msg.c#4 integrate
> >>nfx-tree/code/sm-sanm-agent/sanm-agent-sm-funcs.c#3 integrate
> >>nfx-tree/code/sm-sanm-agent/sanm-agent-util.c#4 integrate
> >>nfx-tree/code/sm-sanm-agent/sanm-dmip-funcs.c#4 integrate
> >>nfx-tree/code/sm-sanm-dm/sanm-dm-log.c#1 integrate
> >>nfx-tree/code/sm-sanm-dm/sanm-dm-msg.c#2 integrate
> >>nfx-tree/code/sm-sanm-dm/sanm-dm-sm-funcs.c#2 integrate
> >>nfx-tree/code/sm-sanm-dm/sanm-dm-ui.c#1 integrate
> >>nfx-tree/code/sm-sbm-rev2/sbm-mgmt.c#3 edit
> >>nfx-tree/code/sm-sbm-rev2/sbm-test.c#3 integrate
> >>nfx-tree/code/sm-sbm-rev2/sbm-txrx.c#3 integrate
> >>nfx-tree/code/sm-sbm-rev2/sbm-verify.c#4 integrate
> >>nfx-tree/code/sm-scsi/Makefile#1 integrate
> >>nfx-tree/code/sm-scsi/devO_sm.sm#1 integrate
> >>nfx-tree/code/sm-scsi/devO_sm_funcs.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-api.h#3 edit
> >>nfx-tree/code/sm-scsi/scsi-cmn-cmds.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-debug.c#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-debug.h#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-dev-cmds.c#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-dev-cmds.h#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-dev-init.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-dev.h#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-disk-cmds.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-ecode.c#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-err.c#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-err.h#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-global.c#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-ll.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-msg.c#3 edit
> >>nfx-tree/code/sm-scsi/scsi-msg.h#4 edit
> >>nfx-tree/code/sm-scsi/scsi-queue.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-queue.h#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-tape-cmds.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-test.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi-test.h#1 integrate
> >>nfx-tree/code/sm-scsi/scsi-ui.c#1 integrate
> >>nfx-tree/code/sm-scsi/scsi.c#2 integrate
> >>nfx-tree/code/sm-scsi/scsi.h#2 integrate
> >>nfx-tree/code/sm-scsi/scsi_sm.sm#1 integrate
> >>nfx-tree/code/sm-scsi/test/test-scsi-ecode.c#1 integrate
> >>nfx-tree/code/sm-scsiio/scsiio-cg.c#2 integrate
> >>nfx-tree/code/sm-scsiio/scsiio-chbc.c#2 integrate
> >>nfx-tree/code/sm-scsiio/scsiio.c#3 integrate
> >>nfx-tree/code/sm-scsit-fp/scsit-ui.c#1 integrate
> >>nfx-tree/code/sm-scsit-fp/scsit.c#1 integrate
> >>nfx-tree/code/sm-sdm-agent/sdm-agent-api.h#1 integrate
> >>nfx-tree/code/sm-sdm-agent/sdm-agent.c#1 integrate
> >>nfx-tree/code/sm-sdm/Makefile#1 integrate
> >>nfx-tree/code/sm-sdm/sdm-api.h#2 integrate
> >>nfx-tree/code/sm-sdm/sdm-db.c#1 integrate
> >>nfx-tree/code/sm-sdm/sdm-db.h#1 integrate
> >>nfx-tree/code/sm-sdm/sdm-init-changer.c#2 edit
> >>nfx-tree/code/sm-sdm/sdm-init-devcap.c#2 edit
> >>nfx-tree/code/sm-sdm/sdm-init-disk-mylex.h#1 integrate
> >>nfx-tree/code/sm-sdm/sdm-init-disk.c#3 edit
> >>nfx-tree/code/sm-sdm/sdm-init-tape.c#1 integrate
> >>nfx-tree/code/sm-sdm/sdm-init.c#3 edit
> >>nfx-tree/code/sm-sdm/sdm-init.h#2 edit
> >>nfx-tree/code/sm-sdm/sdm-main.c#3 edit
> >>nfx-tree/code/sm-sdm/sdm-msg.c#3 edit
> >>nfx-tree/code/sm-sdm/sdm-msg.h#2 integrate
> >>nfx-tree/code/sm-sdm/sdm-verify.c#3 edit
> >>nfx-tree/code/sm-sdm/sdm.h#3 edit
> >>nfx-tree/code/sm-seep/env.c#3 integrate
> >>nfx-tree/code/sm-simtape/simtape-api.c#2 integrate
> >>nfx-tree/code/sm-simtape/simtape.c#3 integrate
> >>nfx-tree/code/sm-spm/spm-api.h#1 integrate
> >>nfx-tree/code/sm-spm/spm-msg.c#3 edit
> >>nfx-tree/code/sm-spm/spm-pool.c#3 edit
> >>nfx-tree/code/sm-spm/spm.h#3 integrate
> >>nfx-tree/code/sm-stats/kpi-api.c#6 integrate
> >>nfx-tree/code/sm-stats/kpi-api.h#2 edit
> >>nfx-tree/code/sm-stats/kpi.h#7 integrate
> >>nfx-tree/code/sm-stats/stats.c#4 integrate
> >>nfx-tree/code/sm-sys-dvt/dvt-api.c#1 integrate
> >>nfx-tree/code/sm-sys-dvt/dvt-api.h#1 integrate
> >>nfx-tree/code/sm-tape/tape-api.h#2 integrate
> >>nfx-tree/code/sm-tape/tape-common.h#2 integrate
> >>nfx-tree/code/sm-tape/tape-device.c#3 edit
> >>nfx-tree/code/sm-tape/tape-device.h#1 integrate
> >>nfx-tree/code/sm-tape/tape-discovery.c#2 integrate
> >>nfx-tree/code/sm-tape/tape-msg.c#3 edit
> >>nfx-tree/code/sm-tape/tape-sm.c#3 edit
> >>nfx-tree/code/sm-tape/tape-sm.h#2 integrate
> >>nfx-tree/code/sm-tape/tape-utils.c#2 integrate
> >>nfx-tree/code/sm-test/test.c#1 integrate
> >>nfx-tree/code/sm-test/testsrvr.c#2 integrate
> >>nfx-tree/code/sm-testdump/testdump-common.c#3 integrate
> >>nfx-tree/code/sm-testdump/testdump-dump.c#2 integrate
> >>nfx-tree/code/sm-timer/timer-api.c#1 integrate
> >>nfx-tree/code/sm-timer/timer-api.h#3 integrate
> >>nfx-tree/code/sm-tpl-fp/tpl-fp.c#2 integrate
> >>nfx-tree/code/sm-ui/cmdtable.c#5 integrate
> >>nfx-tree/code/sm-ui/commands.c#3 integrate
> >>nfx-tree/code/sm-ui/uihdr.h#5 integrate
> >>nfx-tree/code/sm-utils/Makefile#2 integrate
> >>nfx-tree/code/sm-utils/cmd-utils.c#5 edit
> >>nfx-tree/code/sm-utils/cmd-utils.h#3 edit
> >>nfx-tree/code/sm-utils/fs-rpc-api.c#3 integrate
> >>nfx-tree/code/sm-utils/sys-utils.c#3 integrate
> >>nfx-tree/code/ssc-authen-lib/authen-lib.c#3 integrate
> >>nfx-tree/code/ssc-authen-lib/dom-cfg.c#2 integrate
> >>nfx-tree/code/ssc-fs-lib/Makefile#1 integrate
> >>nfx-tree/code/ssc-fs-lib/fs-remote-snappin-api.c#2 integrate
> >>nfx-tree/code/ssc-genlib/cm-util-cg.c#2 integrate
> >>nfx-tree/code/ssc-ncm-lib/ncm-api.c#3 edit
> >>nfx-tree/code/ssc-ncm/ncm.c#3 edit
> >>nfx-tree/code/ssc-ndmp/Makefile#1 integrate
> >>nfx-tree/code/ssc-ndmp/ndmp-data.c#2 integrate
> >>nfx-tree/code/ssc-ndmp/ndmp-info.c#2 edit
> >>nfx-tree/code/ssc-ndmp/ndmp-scsi.c#2 edit
> >>nfx-tree/code/ssc-ndmp/ndmp-snap.c#2 integrate
> >>nfx-tree/code/ssc-ndmp/ndmp-ssc-util.c#2 integrate
> >>nfx-tree/code/ssc-ndmp/ndmp-ssc.h#1 integrate
> >>nfx-tree/code/ssc-ndmp/ndmp-tape.c#2 edit
> >>nfx-tree/code/ssc-nfxsh/Makefile#3 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_cshare.c#4 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_cshare.h#2 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_domain.c#3 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_elog.c#3 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_filesystem.c#2 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_flash-linux.c#1 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_flash.c#2 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_help.c#3 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_interface.c#3 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_promupgrade.c#2 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_spool.c#3 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_system.c#4 integrate
> >>nfx-tree/code/ssc-nfxsh/cmd_upgrade.c#2 edit
> >>nfx-tree/code/ssc-nfxsh/cmd_vif.c#2 integrate
> >>nfx-tree/code/ssc-nfxsh/kpi-ui.c#4 integrate
> >>nfx-tree/code/ssc-nfxsh/menu.c#3 integrate
> >>nfx-tree/code/ssc-nfxsh/nfxsh.h#3 integrate
> >>nfx-tree/code/ssc-nfxsh/verify_install.in#2 integrate
> >>nfx-tree/code/ssc-rmc/Makefile#2 integrate
> >>nfx-tree/code/ssc-rmc/rmc.c#5 integrate
> >>nfx-tree/code/ssc-rmc/rmc_api.c#4 integrate
> >>nfx-tree/code/ssc-rmc/rmc_rpc_api.c#3 edit
> >>nfx-tree/code/ssc-sanm/sanm-api.h#4 integrate
> >>nfx-tree/code/ssc-sanm/sanm-msg.c#4 integrate
> >>nfx-tree/code/ssc-sanm/sanm-util.c#3 integrate
> >>nfx-tree/code/ssc-support/Makefile#1 integrate
> >>nfx-tree/code/ssc-support/check-ntp.sh#1 branch
> >>nfx-tree/code/ssc-support/emrscron#3 integrate
> >>nfx-tree/code/ssc-support/support.sh#4 integrate
> >>nfx-tree/code/ssc-tests/audittest.c#1 integrate
> >>nfx-tree/code/ssc-tests/hostidtest-openbsd.c#1 integrate
> >>nfx-tree/code/ssc-tests/ipmdlibtest-openbsd.c#1 integrate
> >>nfx-tree/code/ssc-tests/ncmtest-openbsd.c#1 integrate
> >>nfx-tree/code/ssc-tests/pmtest.c#3 edit
> >>nfx-tree/code/ssc-volread/volread.c#2 integrate
> >>nfx-tree/code/ssc-vsd/vs-daemon.c#4 edit
> >>nfx-tree/code/ssc-vsd/vs-util.h#3 integrate
> >>nfx-tree/code/ssc-zebra/Makefile#1 integrate
> >>nfx-tree/linux.mk#1 integrate
> >>prom/cg/code/prom-pmon/cmdtable.c#2 integrate
> >>prom/cg/code/sm-loader/load-cougar.c#3 integrate
> >>prom/cg/code/sm-pci/Makefile#2 integrate
> >>prom/cg/code/sm-pci/pci-cougar.c#2 integrate
> >>prom/cg/code/sm-seep/seep.h#1 integrate
> 
