[prev in list] [next in list] [prev in thread] [next in thread]
List: illumos-developer
Subject: Re: [developer] strange upstream fetch result
From: "Gabriele Bulfon" <gbulfon () sonicle ! com>
Date: 2016-11-24 15:39:21
Message-ID: 4496827.663.1480001961252.JavaMail.sonicle () www
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
I just used this :
https://help.github.com/articles/syncing-a-fork/
So it was just a git merge upstream/master.
At first try I got en error about renaming and was suggested to set
renamelimit = 1829 .
I did a snap rollback and restarted fetch , set the renamelimit and merge.
Here I attached the merge output, with the conflicts I had to resolve.
Gabriele
----------------------------------------------------------------------------------------
Sonicle S.r.l.
>
http://www.sonicle.com
Music:
http://www.gabrielebulfon.com
Quantum Mechanics :
http://www.cdbaby.com/cd/gabrielebulfon
----------------------------------------------------------------------------------
Da: Robert Mustacchi
developer@lists.illumos.org
Data: 24 novembre 2016 16.31.05 CET
Oggetto: Re: [developer] strange upstream fetch result
On 11/24/16 3:03 , Gabriele Bulfon wrote:
Hi,
after doing an upstream fetch and merge, I had to resolve some conflicts all around \
the sfxge (usr/src/uts/common/io/sfxge) files. After that I ran a full illumos \
build, but got some errors right under sfxge. By comparing my files with the ones on \
illumos@github I realized that many of the files inside usr/src/uts/common/io/sfxge \
were moved into usr/src/uts/common/io/sfxge/common, but my repo still had the \
originals also inside usr/src/uts/common/io/sfxge (not deleted), and this was causing \
some wrong precedences in includes. Why? Shouldn't fetch&merge;resolve this already? \
Any idea? You should look at how git interpreted what you did and the long copious
number of options to control how it merges. Sorry, I don't have anything
more specific to suggest.
Robert
[Attachment #5 (text/html)]
<html><html><div style="font-family: Arial; font-size: 13px;"><span \
style="font-family: Tahoma; font-size: 16px;">I just used this : </span><a \
href="https://help.github.com/articles/syncing-a-fork/" style="font-family: Tahoma; \
font-size: 16px;">https://help.github.com/articles/syncing-a-fork/</a><br \
style="font-family: Tahoma; font-size: 16px;" /><span style="font-family: Tahoma; \
font-size: 16px;">So it was just a git merge upstream/master.</span><br \
style="font-family: Tahoma; font-size: 16px;" /><span style="font-family: Tahoma; \
font-size: 16px;">At first try I got en error about renaming and was suggested to set \
</span><span style="font-family: Tahoma; font-size: 16px;">renamelimit = 1829 \
.</span><br style="font-family: Tahoma; font-size: 16px;" /><span style="font-family: \
Tahoma; font-size: 16px;">I did a snap rollback and restarted fetch , set the \
renamelimit and merge.</span><br style="font-family: Tahoma; font-size: 16px;" \
/><span style="font-family: Tahoma; font-size: 16px;">Here I attached the merge \
output, with the conflicts I had to resolve.</span></div><div><font face="Tahoma"><br \
/></font></div><div><font face="Tahoma">Gabriele<br /></font><br /><div \
id="wt-mailcard" style="font-family: Arial; font-size: 13px;"><div \
style="font-family: Arial;">----------------------------------------------------------------------------------------<br \
/></div><div style="font-family: Arial;"><b>Sonicle S.r.l. </b>: <a \
href="http://www.sonicle.com/" target="_new">http://www.sonicle.com</a></div><div \
style="font-family: Arial;"><b>Music: </b><a href="http://www.gabrielebulfon.com/" \
target="_new">http://www.gabrielebulfon.com</a></div><div style="font-family: \
Arial;"><b>Quantum Mechanics : </b><a href="http://www.cdbaby.com/cd/gabrielebulfon" \
target="_new">http://www.cdbaby.com/cd/gabrielebulfon</a></div></div><tt \
style="font-family: Arial; font-size: 13px;"><br /><br /><br \
/>----------------------------------------------------------------------------------<br \
/><br />Da: Robert Mustacchi <rm@joyent.com><br />A: \
developer@lists.illumos.org <br />Data: 24 novembre 2016 16.31.05 CET<br />Oggetto: \
Re: [developer] strange upstream fetch result<br /><br /></tt><blockquote \
style="font-family: Arial; font-size: 13px; border-left: 2px solid rgb(0, 0, 128); \
margin-left: 5px; padding-left: 5px;"><tt>On 11/24/16 3:03 , Gabriele Bulfon \
wrote:<br />> Hi,<br />> after doing an upstream fetch and merge, I had to \
resolve some conflicts all around the sfxge (usr/src/uts/common/io/sfxge) files.<br \
/>> After that I ran a full illumos build, but got some errors right under \
sfxge.<br />> By comparing my files with the ones on illumos@github I realized \
that many of the files inside usr/src/uts/common/io/sfxge were moved into \
usr/src/uts/common/io/sfxge/common, but my repo still had the originals also inside \
usr/src/uts/common/io/sfxge (not deleted), and this was causing some wrong \
precedences in includes.<br />> Why? Shouldn't fetch&merge;resolve this \
already? Any idea?<br /><br />You should look at how git interpreted what you did and \
the long copious<br />number of options to control how it merges. Sorry, I don't \
have anything<br />more specific to suggest.<br /><br />Robert<br /><br /><br /><br \
/><br /></tt></blockquote></div></html><div bgcolor="#ffffff" id="listbox-footer" \
style="width:auto;margin:0;padding:5px;background-color:#fff;clear:both;border-top: \
1px solid #ccc;"><table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" \
style="background-color:#fff" width="100%"><tr><td padding="4px"><font \
color="#333333" size="1" style="font-family:helvetica, sans-serif;"> \
<strong>illumos-developer</strong> | <a \
href="https://www.listbox.com/member/archive/182179/=now" \
style="text-decoration:none;color:#669933;border-bottom: 1px solid #444444" title="Go \
to archives for illumos-developer">Archives</a> <a border="0" \
href="https://www.listbox.com/member/archive/rss/182179/25758058-4e9228dc" \
style="text-decoration:none;color:#669933" title="RSS feed for \
illumos-developer"><img border="0" \
src="http://postlink.www.listbox.com/2254924/833487e62783d55fe81f119fb93ef644/25758058 \
/bb3fe179.jpg?uri=aHR0cHM6Ly93d3cubGlzdGJveC5jb20vaW1hZ2VzL2ZlZWQtaWNvbi0xMHgxMC5qcGc" \
/></a> | <a href="https://www.listbox.com/member/?member_id=25758058&id_secret=25758058-c19b436a" \
style="text-decoration:none;color:#669933;border-bottom: 1px solid #444444" \
title="">Modify</a> Your Subscription<td align="right" valign="top"><a \
href="http://www.listbox.com" style="border-bottom:none;"> <img border="0" \
src="http://postlink.www.listbox.com/2254925/3379085af0f1cf7fc3708f04b4471ae2/25758058 \
/bb3fe179.png?uri=aHR0cHM6Ly93d3cubGlzdGJveC5jb20vaW1hZ2VzL2xpc3Rib3gtbG9nby1zbWFsbC5wbmc" \
title="Powered by Listbox" /></a></td></font></td></tr></table></div></html>
["fetch-upstream.txt" (text/plain)]
Removing usr/src/uts/sun4u/zuluvm/zuluvm_offsets.in
Removing usr/src/uts/sun4u/zuluvm/Makefile
Removing usr/src/uts/sun4u/vm/zulu_hat.c
Removing usr/src/uts/sun4u/sys/zuluvm.h
Removing usr/src/uts/sun4u/sys/zulumod.h
Removing usr/src/uts/sun4u/sys/zulu_hat.h
Removing usr/src/uts/sun4u/ml/zulu_hat_asm.s
Removing usr/src/uts/sun4u/ml/zulu_asm.s
Removing usr/src/uts/sun4u/io/zuluvm.c
Removing usr/src/uts/sfmmu/vm/xhat_sfmmu.h
Removing usr/src/uts/sfmmu/vm/xhat_sfmmu.c
Auto-merging usr/src/uts/intel/sfxge/Makefile
CONFLICT (add/add): Merge conflict in usr/src/uts/intel/sfxge/Makefile
Removing usr/src/uts/intel/io/acpica/disassembler/dmobject.c
Removing usr/src/uts/intel/io/acpica/debugger/dbxface.c
Removing usr/src/uts/intel/io/acpica/debugger/dbutils.c
Removing usr/src/uts/intel/io/acpica/debugger/dbstats.c
Removing usr/src/uts/intel/io/acpica/debugger/dbnames.c
Removing usr/src/uts/intel/io/acpica/debugger/dbmethod.c
Removing usr/src/uts/intel/io/acpica/debugger/dbinput.c
Removing usr/src/uts/intel/io/acpica/debugger/dbhistry.c
Removing usr/src/uts/intel/io/acpica/debugger/dbfileio.c
Removing usr/src/uts/intel/io/acpica/debugger/dbexec.c
Removing usr/src/uts/intel/io/acpica/debugger/dbdisply.c
Removing usr/src/uts/intel/io/acpica/debugger/dbcmds.c
Auto-merging usr/src/uts/intel/Makefile.intel
CONFLICT (content): Merge conflict in usr/src/uts/intel/Makefile.intel
Removing usr/src/uts/i86pc/os/acpi_fw.h
Removing usr/src/uts/common/vm/xhat.h
Removing usr/src/uts/common/vm/xhat.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_vpd.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_vpd.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_tx.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_tx.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_tcp.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_tcp.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_sram.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_sram.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_rx.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_rx.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_phy.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_phy.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_pci.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_pci.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_nvram.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_nvram.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_mon.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_mon.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_mcdi.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_mcdi.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_mac.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_mac.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_ioc.h
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_ioc.h
Auto-merging usr/src/uts/common/io/sfxge/sfxge_intr.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_intr.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_gld_v3.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_gld_v3.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_ev.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_ev.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_err.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_err.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_dma.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_dma.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge_debug.h
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_debug.h
Auto-merging usr/src/uts/common/io/sfxge/sfxge_bar.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge_bar.c
Auto-merging usr/src/uts/common/io/sfxge/sfxge.h
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge.h
Auto-merging usr/src/uts/common/io/sfxge/sfxge.c
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/sfxge.c
Auto-merging usr/src/uts/common/io/sfxge/efsys.h
CONFLICT (add/add): Merge conflict in usr/src/uts/common/io/sfxge/efsys.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_x540.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_x540.c
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_type.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_phy.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_phy.c
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_mbx.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_mbx.c
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_common.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_common.c
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_api.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_api.c
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_82599.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_82599.c
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_82598.h
Auto-merging usr/src/uts/common/io/ixgbe/core/ixgbe_82598.c
Auto-merging usr/src/uts/common/Makefile.rules
Auto-merging usr/src/uts/common/Makefile.files
Auto-merging usr/src/tools/scripts/onu.sh.in
Auto-merging usr/src/test/zfs-tests/tests/perf/Makefile
Auto-merging usr/src/test/zfs-tests/tests/functional/vdev_zaps/setup.ksh
Auto-merging usr/src/test/zfs-tests/tests/functional/vdev_zaps/cleanup.ksh
Removing usr/src/test/zfs-tests/tests/functional/inuse/inuse_002_pos.ksh
Removing usr/src/test/zfs-tests/tests/functional/interop/setup.ksh
Removing usr/src/test/zfs-tests/tests/functional/interop/interop_001_pos.ksh
Removing usr/src/test/zfs-tests/tests/functional/interop/interop.cfg
Removing usr/src/test/zfs-tests/tests/functional/interop/cleanup.ksh
Removing usr/src/test/zfs-tests/tests/functional/grow_replicas/setup.ksh
Removing usr/src/test/zfs-tests/tests/functional/grow_replicas/cleanup.ksh
Removing usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_013_neg.ksh
Auto-merging usr/src/test/zfs-tests/cmd/mkfiles/Makefile
Auto-merging usr/src/test/test-runner/cmd/run
Removing usr/src/psm/stand/bootblks/ufs/i386/installboot.sh
Auto-merging usr/src/pkg/manifests/system-extended-system-utilities.mf
Auto-merging usr/src/pkg/manifests/service-network-smtp-sendmail.mf
Auto-merging usr/src/pkg/manifests/driver-network-sfxge.mf
CONFLICT (add/add): Merge conflict in usr/src/pkg/manifests/driver-network-sfxge.mf
Auto-merging usr/src/pkg/manifests/SUNWcs.mf
Auto-merging usr/src/pkg/Makefile
Removing usr/src/man/man4/sshd_config.4
Removing usr/src/man/man4/ssh_config.4
Removing usr/src/man/man1m/sshd.1m
Removing usr/src/man/man1m/ssh-keysign.1m
Removing usr/src/man/man1m/sftp-server.1m
Removing usr/src/man/man1/ssh.1
Removing usr/src/man/man1/ssh-socks5-proxy-connect.1
Removing usr/src/man/man1/ssh-keyscan.1
Removing usr/src/man/man1/ssh-keygen.1
Removing usr/src/man/man1/ssh-http-proxy-connect.1
Removing usr/src/man/man1/ssh-agent.1
Removing usr/src/man/man1/ssh-add.1
Removing usr/src/man/man1/sftp.1
Removing usr/src/man/man1/scp.1
Removing usr/src/lib/smbsrv/libsmb/common/smb_mac.c
Removing usr/src/lib/libsmbfs/smb/spnego.h
Auto-merging usr/src/lib/libsmbfs/netsmb/ntlmssp.h
Auto-merging usr/src/lib/libads/sparcv9/Makefile
Auto-merging usr/src/lib/libads/sparc/Makefile
Auto-merging usr/src/lib/libads/i386/Makefile
Auto-merging usr/src/lib/libads/common/mapfile-vers
Auto-merging usr/src/lib/libads/common/llib-lads
Auto-merging usr/src/lib/libads/amd64/Makefile
Auto-merging usr/src/lib/libads/Makefile.com
Auto-merging usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
Auto-merging usr/src/lib/Makefile
CONFLICT (content): Merge conflict in usr/src/lib/Makefile
Removing usr/src/cmd/ssh/sshd/sshpty.c
Removing usr/src/cmd/ssh/sshd/sshlogin.c
Removing usr/src/cmd/ssh/sshd/sshd.c
Removing usr/src/cmd/ssh/sshd/session.c
Removing usr/src/cmd/ssh/sshd/serverloop.c
Removing usr/src/cmd/ssh/sshd/servconf.c
Removing usr/src/cmd/ssh/sshd/loginrec.c
Removing usr/src/cmd/ssh/sshd/gss-serv.c
Removing usr/src/cmd/ssh/sshd/groupaccess.c
Removing usr/src/cmd/ssh/sshd/bsmaudit.c
Removing usr/src/cmd/ssh/sshd/auth2.c
Removing usr/src/cmd/ssh/sshd/auth2-pubkey.c
Removing usr/src/cmd/ssh/sshd/auth2-passwd.c
Removing usr/src/cmd/ssh/sshd/auth2-pam.c
Removing usr/src/cmd/ssh/sshd/auth2-none.c
Removing usr/src/cmd/ssh/sshd/auth2-kbdint.c
Removing usr/src/cmd/ssh/sshd/auth2-hostbased.c
Removing usr/src/cmd/ssh/sshd/auth2-gss.c
Removing usr/src/cmd/ssh/sshd/auth2-chall.c
Removing usr/src/cmd/ssh/sshd/auth1.c
Removing usr/src/cmd/ssh/sshd/auth.c
Removing usr/src/cmd/ssh/sshd/auth-skey.c
Removing usr/src/cmd/ssh/sshd/auth-sia.c
Removing usr/src/cmd/ssh/sshd/auth-rsa.c
Removing usr/src/cmd/ssh/sshd/auth-rhosts.c
Removing usr/src/cmd/ssh/sshd/auth-rh-rsa.c
Removing usr/src/cmd/ssh/sshd/auth-passwd.c
Removing usr/src/cmd/ssh/sshd/auth-pam.c
Removing usr/src/cmd/ssh/sshd/auth-options.c
Removing usr/src/cmd/ssh/sshd/auth-krb5.c
Removing usr/src/cmd/ssh/sshd/auth-krb4.c
Removing usr/src/cmd/ssh/sshd/auth-chall.c
Removing usr/src/cmd/ssh/sshd/auth-bsdauth.c
Removing usr/src/cmd/ssh/sshd/altprivsep.c
Removing usr/src/cmd/ssh/sshd/Makefile
Removing usr/src/cmd/ssh/ssh/sshtty.c
Removing usr/src/cmd/ssh/ssh/sshconnect2.c
Removing usr/src/cmd/ssh/ssh/sshconnect1.c
Removing usr/src/cmd/ssh/ssh/sshconnect.c
Removing usr/src/cmd/ssh/ssh/ssh.c
Removing usr/src/cmd/ssh/ssh/gss-clnt.c
Removing usr/src/cmd/ssh/ssh/clientloop.c
Removing usr/src/cmd/ssh/ssh-socks5-proxy-connect/ssh-socks5-proxy-connect.c
Removing usr/src/cmd/ssh/ssh-socks5-proxy-connect/Makefile
Removing usr/src/cmd/ssh/ssh-keysign/ssh-keysign.c
Removing usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c
Removing usr/src/cmd/ssh/ssh-keyscan/Makefile
Removing usr/src/cmd/ssh/ssh-keygen/ssh-keygen.c
Removing usr/src/cmd/ssh/ssh-keygen/Makefile
Removing usr/src/cmd/ssh/ssh-http-proxy-connect/ssh-http-proxy-connect.c
Removing usr/src/cmd/ssh/ssh-http-proxy-connect/Makefile
Removing usr/src/cmd/ssh/ssh-agent/ssh-agent.c
Removing usr/src/cmd/ssh/ssh-agent/Makefile
Removing usr/src/cmd/ssh/ssh-add/ssh-add.c
Removing usr/src/cmd/ssh/ssh-add/Makefile
Removing usr/src/cmd/ssh/sftp/sftp.c
Removing usr/src/cmd/ssh/sftp/sftp-glob.c
Removing usr/src/cmd/ssh/sftp/sftp-client.c
Removing usr/src/cmd/ssh/sftp-server/sftp-server.c
Removing usr/src/cmd/ssh/scp/scp.c
Removing usr/src/cmd/ssh/scp/Makefile
Removing usr/src/cmd/ssh/req.flg
Removing usr/src/cmd/ssh/libssh/sparc/Makefile
Removing usr/src/cmd/ssh/libssh/common/xmalloc.c
Removing usr/src/cmd/ssh/libssh/common/xlist.c
Removing usr/src/cmd/ssh/libssh/common/uuencode.c
Removing usr/src/cmd/ssh/libssh/common/uidswap.c
Removing usr/src/cmd/ssh/libssh/common/ttymodes.c
Removing usr/src/cmd/ssh/libssh/common/tildexpand.c
Removing usr/src/cmd/ssh/libssh/common/ssh-rsa.c
Removing usr/src/cmd/ssh/libssh/common/ssh-gss.c
Removing usr/src/cmd/ssh/libssh/common/ssh-dss.c
Removing usr/src/cmd/ssh/libssh/common/sftp-common.c
Removing usr/src/cmd/ssh/libssh/common/rsa.c
Removing usr/src/cmd/ssh/libssh/common/readpass.c
Removing usr/src/cmd/ssh/libssh/common/readconf.c
Removing usr/src/cmd/ssh/libssh/common/radix.c
Removing usr/src/cmd/ssh/libssh/common/proxy-io.c
Removing usr/src/cmd/ssh/libssh/common/progressmeter.c
Removing usr/src/cmd/ssh/libssh/common/packet.c
Removing usr/src/cmd/ssh/libssh/common/nchan.c
Removing usr/src/cmd/ssh/libssh/common/msg.c
Removing usr/src/cmd/ssh/libssh/common/mpaux.c
Removing usr/src/cmd/ssh/libssh/common/misc.c
Removing usr/src/cmd/ssh/libssh/common/match.c
Removing usr/src/cmd/ssh/libssh/common/mac.c
Removing usr/src/cmd/ssh/libssh/common/log.c
Removing usr/src/cmd/ssh/libssh/common/llib-lssh
Removing usr/src/cmd/ssh/libssh/common/key.c
Removing usr/src/cmd/ssh/libssh/common/kexgsss.c
Removing usr/src/cmd/ssh/libssh/common/kexgssc.c
Removing usr/src/cmd/ssh/libssh/common/kexgexs.c
Removing usr/src/cmd/ssh/libssh/common/kexgexc.c
Removing usr/src/cmd/ssh/libssh/common/kexgex.c
Removing usr/src/cmd/ssh/libssh/common/kexdhs.c
Removing usr/src/cmd/ssh/libssh/common/kexdhc.c
Removing usr/src/cmd/ssh/libssh/common/kexdh.c
Removing usr/src/cmd/ssh/libssh/common/kex.c
Removing usr/src/cmd/ssh/libssh/common/hostfile.c
Removing usr/src/cmd/ssh/libssh/common/g11n.c
Removing usr/src/cmd/ssh/libssh/common/entropy.c
Removing usr/src/cmd/ssh/libssh/common/engine.c
Removing usr/src/cmd/ssh/libssh/common/dispatch.c
Removing usr/src/cmd/ssh/libssh/common/dh.c
Removing usr/src/cmd/ssh/libssh/common/deattack.c
Removing usr/src/cmd/ssh/libssh/common/crc32.c
Removing usr/src/cmd/ssh/libssh/common/compress.c
Removing usr/src/cmd/ssh/libssh/common/compat.c
Removing usr/src/cmd/ssh/libssh/common/cipher.c
Removing usr/src/cmd/ssh/libssh/common/cipher-ctr.c
Removing usr/src/cmd/ssh/libssh/common/channels.c
Removing usr/src/cmd/ssh/libssh/common/canohost.c
Removing usr/src/cmd/ssh/libssh/common/buffer.c
Removing usr/src/cmd/ssh/libssh/common/bufaux.c
Removing usr/src/cmd/ssh/libssh/common/authfile.c
Removing usr/src/cmd/ssh/libssh/common/authfd.c
Removing usr/src/cmd/ssh/libssh/common/atomicio.c
Removing usr/src/cmd/ssh/libssh/common/addrmatch.c
Removing usr/src/cmd/ssh/libssh/Makefile.com
Removing usr/src/cmd/ssh/libssh/Makefile
Removing usr/src/cmd/ssh/libopenbsd-compat/common/strmode.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/strlcpy.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/strlcat.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/sigact.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/setproctitle.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/setenv.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/realpath.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/readpassphrase.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/port-irix.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/mktemp.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/llib-lopenbsd-compat
Removing usr/src/cmd/ssh/libopenbsd-compat/common/inet_ntop.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/inet_aton.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/glob.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/getcwd.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/fake-getnameinfo.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/fake-getaddrinfo.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/dirname.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bsd-snprintf.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bsd-misc.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bsd-cygwin_util.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bsd-cray.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bsd-asprintf.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bsd-arc4random.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/bindresvport.c
Removing usr/src/cmd/ssh/libopenbsd-compat/common/base64.c
Removing usr/src/cmd/ssh/libopenbsd-compat/Makefile.com
Removing usr/src/cmd/ssh/libopenbsd-compat/Makefile
Removing usr/src/cmd/ssh/include/xmalloc.h
Removing usr/src/cmd/ssh/include/xlist.h
Removing usr/src/cmd/ssh/include/version.h
Removing usr/src/cmd/ssh/include/uuencode.h
Removing usr/src/cmd/ssh/include/uidswap.h
Removing usr/src/cmd/ssh/include/ttymodes.h
Removing usr/src/cmd/ssh/include/tildexpand.h
Removing usr/src/cmd/ssh/include/sys-tree.h
Removing usr/src/cmd/ssh/include/sys-queue.h
Removing usr/src/cmd/ssh/include/strmode.h
Removing usr/src/cmd/ssh/include/strlcpy.h
Removing usr/src/cmd/ssh/include/strlcat.h
Removing usr/src/cmd/ssh/include/sshpty.h
Removing usr/src/cmd/ssh/include/sshlogin.h
Removing usr/src/cmd/ssh/include/sshconnect.h
Removing usr/src/cmd/ssh/include/ssh2.h
Removing usr/src/cmd/ssh/include/ssh1.h
Removing usr/src/cmd/ssh/include/ssh.h
Removing usr/src/cmd/ssh/include/ssh-rsa.h
Removing usr/src/cmd/ssh/include/ssh-gss.h
Removing usr/src/cmd/ssh/include/ssh-dss.h
Removing usr/src/cmd/ssh/include/sigact.h
Removing usr/src/cmd/ssh/include/sftp.h
Removing usr/src/cmd/ssh/include/sftp-client.h
Removing usr/src/cmd/ssh/include/setproctitle.h
Removing usr/src/cmd/ssh/include/session.h
Removing usr/src/cmd/ssh/include/serverloop.h
Removing usr/src/cmd/ssh/include/servconf.h
Removing usr/src/cmd/ssh/include/rsa.h
Removing usr/src/cmd/ssh/include/rresvport.h
Removing usr/src/cmd/ssh/include/realpath.h
Removing usr/src/cmd/ssh/include/readpassphrase.h
Removing usr/src/cmd/ssh/include/readpass.h
Removing usr/src/cmd/ssh/include/readconf.h
Removing usr/src/cmd/ssh/include/proxy-io.h
Removing usr/src/cmd/ssh/include/port-irix.h
Removing usr/src/cmd/ssh/include/pathnames.h
Removing usr/src/cmd/ssh/include/packet.h
Removing usr/src/cmd/ssh/include/openbsd-compat.h
Removing usr/src/cmd/ssh/include/myproposal.h
Removing usr/src/cmd/ssh/include/mpaux.h
Removing usr/src/cmd/ssh/include/mktemp.h
Removing usr/src/cmd/ssh/include/misc.h
Removing usr/src/cmd/ssh/include/match.h
Removing usr/src/cmd/ssh/include/loginrec.h
Removing usr/src/cmd/ssh/include/log.h
Removing usr/src/cmd/ssh/include/key.h
Removing usr/src/cmd/ssh/include/kex.h
Removing usr/src/cmd/ssh/include/inet_ntop.h
Removing usr/src/cmd/ssh/include/inet_ntoa.h
Removing usr/src/cmd/ssh/include/includes.h
Removing usr/src/cmd/ssh/include/hostfile.h
Removing usr/src/cmd/ssh/include/getput.h
Removing usr/src/cmd/ssh/include/getopt.h
Removing usr/src/cmd/ssh/include/getgrouplist.h
Removing usr/src/cmd/ssh/include/getcwd.h
Removing usr/src/cmd/ssh/include/g11n.h
Removing usr/src/cmd/ssh/include/fake-socket.h
Removing usr/src/cmd/ssh/include/fake-getnameinfo.h
Removing usr/src/cmd/ssh/include/fake-getaddrinfo.h
Removing usr/src/cmd/ssh/include/fake-gai-errnos.h
Removing usr/src/cmd/ssh/include/dispatch.h
Removing usr/src/cmd/ssh/include/dirname.h
Removing usr/src/cmd/ssh/include/defines.h
Removing usr/src/cmd/ssh/include/deattack.h
Removing usr/src/cmd/ssh/include/crc32.h
Removing usr/src/cmd/ssh/include/config.h
Removing usr/src/cmd/ssh/include/compress.h
Removing usr/src/cmd/ssh/include/compat.h
Removing usr/src/cmd/ssh/include/clientloop.h
Removing usr/src/cmd/ssh/include/cipher.h
Removing usr/src/cmd/ssh/include/channels.h
Removing usr/src/cmd/ssh/include/canohost.h
Removing usr/src/cmd/ssh/include/buffer.h
Removing usr/src/cmd/ssh/include/bufaux.h
Removing usr/src/cmd/ssh/include/bsd-snprintf.h
Removing usr/src/cmd/ssh/include/bsd-misc.h
Removing usr/src/cmd/ssh/include/bsd-getpeereid.h
Removing usr/src/cmd/ssh/include/bindresvport.h
Removing usr/src/cmd/ssh/include/base64.h
Removing usr/src/cmd/ssh/include/authfile.h
Removing usr/src/cmd/ssh/include/authfd.h
Removing usr/src/cmd/ssh/include/auth2-pam.h
Removing usr/src/cmd/ssh/include/auth.h
Removing usr/src/cmd/ssh/include/auth-pam.h
Removing usr/src/cmd/ssh/include/auth-options.h
Removing usr/src/cmd/ssh/include/altprivsep.h
Removing usr/src/cmd/ssh/etc/moduli
Removing usr/src/cmd/ssh/doc/nchan2.ms
Removing usr/src/cmd/ssh/doc/nchan.ms
Removing usr/src/cmd/ssh/doc/WARNING.RNG
Removing usr/src/cmd/ssh/doc/README.Ylonen
Removing usr/src/cmd/ssh/doc/README
Removing usr/src/cmd/ssh/doc/OVERVIEW
Removing usr/src/cmd/ssh/doc/INSTALL
Removing usr/src/cmd/ssh/doc/ChangeLog
Removing usr/src/cmd/ssh/doc/CREDITS
Removing usr/src/cmd/ssh/doc/COPYING.Ylonen
Removing usr/src/cmd/ssh/README.altprivsep
Removing usr/src/cmd/ssh/Makefile.ssh-common
Removing usr/src/cmd/ssh/Makefile.msg.targ
Removing usr/src/cmd/smbsrv/fksmbd/Watch-pipesvc.d
Removing usr/src/cmd/smbsrv/dtrace/stype.d
Removing usr/src/cmd/smbsrv/dtrace/msrpc.d
Removing usr/src/cmd/smbsrv/dtrace/cifs.d
Auto-merging usr/src/cmd/mdb/sparc/v9/libpython/Makefile
Auto-merging usr/src/cmd/mdb/sparc/v7/libpython/Makefile
Auto-merging usr/src/cmd/mdb/intel/ia32/libpython/Makefile
Auto-merging usr/src/cmd/mdb/intel/amd64/libpython/Makefile
Auto-merging usr/src/cmd/mdb/common/modules/libpython/libpython.c
Auto-merging usr/src/cmd/mandoc/tag.h
Auto-merging usr/src/cmd/mandoc/mandoc_ohash.h
Auto-merging usr/src/cmd/mandoc/mandoc_aux.h
Auto-merging usr/src/cmd/mandoc/compat_reallocarray.c
Removing usr/src/cmd/mandoc/chars.in
Removing usr/src/cmd/mandoc/att.in
Removing usr/src/cmd/mandoc/arch.in
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/UnknownTypeConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/TypeEditor.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/SubFieldTokenizer.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/StringConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/StringArrayConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ReliefEnum.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/PointConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ParseException.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/OrientationEnum.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/OpFilter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/OpArrayConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/OpAction.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/Op.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ModeEnum.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ListParser.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/IntegerConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/IntHolder.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/IntArrayConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/InsetsConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ImageRefConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ImageRef.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/GBConstraintsConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/FontConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/DoubleHolder.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/DoubleArrayConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/DimensionConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/Converter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ColorStore.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ColorConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/CharacterConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/BooleanConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/BaseEnumHelper.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/BaseEnumConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/BaseEnum.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AttributeListConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AttributeConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/ApplyException.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AnchorEnum.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AlignmentEnum.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AMRefConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AMRef.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/type/AMConverter.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/WindowShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/TextFieldShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/TextComponentShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/TextAreaShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/ScrollbarShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/PanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/MenuShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/MenuItemShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/MenuComponentShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/MenuBarShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/ListShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/LabelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/JAShadowAccess.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/FrameShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/FileDialogShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/DialogShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/ContainerShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/ComponentShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/ChoiceShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/CheckboxShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/CanvasShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/ButtonShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/BeanableComponent.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/BeanShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/java/awt/BeanComponentShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/VJPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/VJCanvasShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/TextListShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/TabbedFolderShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/ScrollableAreaShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/ScrollPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/MultiLineLabelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/LabelBarShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/ImageLabelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/ImageButtonShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/GenericWindowShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/GenericComponentShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/GBPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/FlowPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/ColumnListShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/CheckboxPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/CardPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/shadow/BorderPanelShadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/props/VisualRTProperties_en_US.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/props/VisualRTProperties_en.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/props/VisualRTProperties.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/props/MessageCatalog.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/props/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/encoding/UCEncoder.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/encoding/UCDecoder.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/encoding/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/encoding/CRC16.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/encoding/CEStreamExhausted.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/VJException.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/VBClassLoader.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Util.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Shadow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/RootObserver.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Root.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/RegistryEntry.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Registry.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/QSortCompare.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Operations.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/NVGroup.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Message.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/MainHelper.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Group.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Global.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/ExternalCallOut.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/DesignerErrorInterface.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/DesignerAccess.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/CustomClassLoader.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/BeanSerialization.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/AttributeManager.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/AttributeList.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/Attribute.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/AMContainerHelper.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/base/AMContainer.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/WinScrollbar.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/VJScrollbar.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/VJPanel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/VJFlowLayout.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/VJErrorDialog.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/VJCanvas.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/VJButton.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/TextView.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/TextList.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/TabbedFolder.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/StringVector.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/StatusBar.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ScrollableArea.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/Scrollable.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ScrollPanel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootWindow.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootFrame.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootDialog.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RWHelper.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/MultiLineLabel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/LabelBar.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/KeyField.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ImageLabel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ImageButton.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/GBPanel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/GBLayout.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/GBContainer.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/GBConstraints.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/EditLine.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ColumnListThread.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ColumnListCanvas.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/ColumnList.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CheckboxPanel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CheckboxList.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CardPanel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CLIconLabel.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CLComponent.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CLChoice.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/CLCheckbox.java
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile.com
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/visualrt/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/util/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/util/HelpDialog.java
Removing usr/src/cmd/krb5/kadmin/gui/util/ContextHelp.java
Removing usr/src/cmd/krb5/kadmin/gui/util/ChoiceDialog.java
Removing usr/src/cmd/krb5/kadmin/gui/native/sparc/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/native/mapfile-vers
Removing usr/src/cmd/krb5/kadmin/gui/native/i386/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/native/Test.java
Removing usr/src/cmd/krb5/kadmin/gui/native/Makefile.com
Removing usr/src/cmd/krb5/kadmin/gui/native/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/native/Kadmin.java
Removing usr/src/cmd/krb5/kadmin/gui/native/Kadmin.c
Removing usr/src/cmd/krb5/kadmin/gui/gkadmin.template
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/LineSeparator.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/EncListDialog.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/DurationHelper.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/DateTimeDialog.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/DCTextField.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/DCPanel.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/DCListener.java
Removing usr/src/cmd/krb5/kadmin/gui/dchanger/DCCircularTextField.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/PrintUtil.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/PrincipalList.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Principal.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/PolicyList.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Policy.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Krb5Conf.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Flags.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Filter.java
Removing usr/src/cmd/krb5/kadmin/gui/dataclasses/Defaults.java
Removing usr/src/cmd/krb5/kadmin/gui/Makefile
Removing usr/src/cmd/krb5/kadmin/gui/KdcGuiRoot.java
Removing usr/src/cmd/krb5/kadmin/gui/KdcGuiOps.java
Removing usr/src/cmd/krb5/kadmin/gui/KdcGuiMain.java
Removing usr/src/cmd/krb5/kadmin/gui/KdcGui.java
Removing usr/src/cmd/krb5/kadmin/gui/HelpIndex.html
Removing usr/src/cmd/krb5/kadmin/gui/HelpData.java
Removing usr/src/cmd/krb5/kadmin/gui/GuiResource.java
Auto-merging usr/src/cmd/idmap/test-getdc/Makefile
Auto-merging usr/src/cmd/idmap/nltest/Makefile
Removing usr/src/cmd/idmap/idmapd/rpc_svc.c
Removing usr/src/cmd/cmd-inet/usr.bin/dns-sd.c
Auto-merging usr/src/cmd/boot/installboot/sparc/installboot.c
Auto-merging usr/src/cmd/boot/installboot/Makefile.com
Removing usr/src/cmd/boot/bootadm/message.h
Auto-merging usr/src/boot/sys/x86/include/_align.h
Auto-merging usr/src/boot/sys/sys/_null.h
Auto-merging usr/src/boot/sys/cddl/boot/zfs/zle.c
Auto-merging usr/src/boot/sys/boot/userboot/userboot/copy.c
Auto-merging usr/src/boot/sys/boot/userboot/userboot/autoload.c
Auto-merging usr/src/boot/sys/boot/i386/libi386/pread.c
Auto-merging usr/src/boot/sys/boot/efi/loader/conf.c
Auto-merging usr/src/boot/sys/boot/efi/loader/autoload.c
Auto-merging usr/src/boot/sys/boot/common/panic.c
Auto-merging usr/src/boot/sys/boot/arm/ixp425/boot2/lib.h
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/reset.c
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/putchar.c
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/memcpy.c
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/memcmp.c
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/lib.h
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/getc.c
Auto-merging usr/src/boot/sys/boot/arm/at91/libat91/delay.c
Auto-merging usr/src/boot/sys/boot/arm/at91/boot2/centipad_board.c
Auto-merging usr/src/boot/sys/boot/arm/at91/boot0spi/main.c
Auto-merging usr/src/boot/sys/boot/arm/at91/boot0iic/main.c
Auto-merging usr/src/boot/sys/boot/arm/at91/boot0/main.c
Auto-merging usr/src/boot/lib/libstand/tftp.h
Auto-merging usr/src/boot/lib/libstand/sparc64/_setjmp.S
Auto-merging usr/src/boot/lib/libstand/inet_ntoa.c
Auto-merging usr/src/boot/lib/libstand/getopt.c
Auto-merging usr/src/Makefile.master
Auto-merging exception_lists/check_rtime
CONFLICT (content): Merge conflict in exception_lists/check_rtime
Automatic merge failed; fix conflicts and then commit the result.
-------------------------------------------
illumos-developer
Archives: https://www.listbox.com/member/archive/182179/=now
RSS Feed: https://www.listbox.com/member/archive/rss/182179/25758058-4e9228dc
Modify Your Subscription: \
https://www.listbox.com/member/?member_id=25758058&id_secret=25758058-c19b436a \
Powered by Listbox: http://www.listbox.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic