Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Aug 2006 18:56:45 GMT
From:      Alex Lyashkov <als@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 105133 for review
Message-ID:  <200608261856.k7QIujSv001956@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=105133

Change 105133 by als@als_head on 2006/08/26 18:56:03

	update to last HEAD and fix panic with stop nfsd thread

Affected files ...

.. //depot/projects/jail2/j2_tools/jresource/jresource.c#3 edit
.. //depot/projects/jail2/sys/Makefile#2 integrate
.. //depot/projects/jail2/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/jail2/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/jail2/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/jail2/sys/amd64/ia32/ia32_syscall.c#2 integrate
.. //depot/projects/jail2/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/jail2/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#3 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/syscalls.conf#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/jail2/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/jail2/sys/arm/arm/gdb_machdep.c#1 branch
.. //depot/projects/jail2/sys/arm/arm/in_cksum.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/mem.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_pio.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_pio_rm9200.h#1 branch
.. //depot/projects/jail2/sys/arm/at91/at91_piovar.h#1 branch
.. //depot/projects/jail2/sys/arm/at91/at91_pmc.c#3 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_rtc.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_rtcreg.h#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_spi.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_spiio.h#2 delete
.. //depot/projects/jail2/sys/arm/at91/at91_spireg.h#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_ssc.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_st.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/at91_twi.c#2 integrate
.. //depot/projects/jail2/sys/arm/at91/files.at91#3 integrate
.. //depot/projects/jail2/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#3 integrate
.. //depot/projects/jail2/sys/arm/at91/std.at91#2 integrate
.. //depot/projects/jail2/sys/arm/at91/std.kb920x#2 integrate
.. //depot/projects/jail2/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/jail2/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/jail2/sys/arm/include/db_machdep.h#2 integrate
.. //depot/projects/jail2/sys/arm/include/gdb_machdep.h#1 branch
.. //depot/projects/jail2/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/jail2/sys/arm/include/sf_buf.h#2 integrate
.. //depot/projects/jail2/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/i80321/iq80321.c#2 integrate
.. //depot/projects/jail2/sys/boot/Makefile#3 integrate
.. //depot/projects/jail2/sys/boot/arm/Makefile#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/Makefile.inc#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot0/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot0iic/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot0iic/doit.c#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/boot0iic/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/doit.c#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/env_vars.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/env_vars.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootiic/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/arm_init.S#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/arm_init.s#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/env_vars.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/env_vars.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/bootspi/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/delay.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/eeprom.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/eeprom.h#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.h#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac_init.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/env_vars.c#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/env_vars.h#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib.h#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/mci_device.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/mci_device.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/p_string.c#2 integrate
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/p_string.h#2 delete
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/reset.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/sd-card.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/sd-card.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.c#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.h#1 branch
.. //depot/projects/jail2/sys/boot/arm/at91/libat91/xmodem.c#2 integrate
.. //depot/projects/jail2/sys/boot/common/help.common#2 integrate
.. //depot/projects/jail2/sys/boot/common/loader.8#2 integrate
.. //depot/projects/jail2/sys/boot/ficl/arm/sysdep.c#1 branch
.. //depot/projects/jail2/sys/boot/ficl/arm/sysdep.h#1 branch
.. //depot/projects/jail2/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/jail2/sys/boot/i386/loader/main.c#2 integrate
.. //depot/projects/jail2/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/jail2/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/jail2/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_pass.c#2 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_emul.c#1 branch
.. //depot/projects/jail2/sys/compat/linux/linux_emul.h#1 branch
.. //depot/projects/jail2/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_futex.c#1 branch
.. //depot/projects/jail2/sys/compat/linux/linux_futex.h#1 branch
.. //depot/projects/jail2/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_signal.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_time.c#1 branch
.. //depot/projects/jail2/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_util.h#2 integrate
.. //depot/projects/jail2/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/Makefile#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_ipc.c#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_proto.h#3 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_socket.c#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_socket.h#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_sockio.c#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_stropts.h#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_syscall.h#3 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_syscallnames.c#3 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_sysent.c#3 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_sysvec.c#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/svr4_util.h#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/syscalls.conf#2 integrate
.. //depot/projects/jail2/sys/compat/svr4/syscalls.master#3 integrate
.. //depot/projects/jail2/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/jail2/sys/conf/NOTES#4 integrate
.. //depot/projects/jail2/sys/conf/files#4 integrate
.. //depot/projects/jail2/sys/conf/files.amd64#3 integrate
.. //depot/projects/jail2/sys/conf/files.arm#2 integrate
.. //depot/projects/jail2/sys/conf/files.i386#3 integrate
.. //depot/projects/jail2/sys/conf/files.ia64#2 integrate
.. //depot/projects/jail2/sys/conf/files.pc98#2 integrate
.. //depot/projects/jail2/sys/conf/files.powerpc#2 integrate
.. //depot/projects/jail2/sys/conf/kern.mk#2 integrate
.. //depot/projects/jail2/sys/conf/kern.post.mk#3 integrate
.. //depot/projects/jail2/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/jail2/sys/conf/kmod.mk#2 integrate
.. //depot/projects/jail2/sys/conf/options#4 integrate
.. //depot/projects/jail2/sys/conf/options.amd64#2 integrate
.. //depot/projects/jail2/sys/conf/options.arm#2 integrate
.. //depot/projects/jail2/sys/conf/options.i386#2 integrate
.. //depot/projects/jail2/sys/conf/options.pc98#2 integrate
.. //depot/projects/jail2/sys/contrib/dev/acpica/acfreebsd.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src.diff#2 delete
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/Makefile#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/jail2/sys/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/jail2/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/jail2/sys/crypto/via/padlock.c#2 integrate
.. //depot/projects/jail2/sys/crypto/via/padlock.h#1 branch
.. //depot/projects/jail2/sys/crypto/via/padlock_cipher.c#1 branch
.. //depot/projects/jail2/sys/crypto/via/padlock_hash.c#1 branch
.. //depot/projects/jail2/sys/ddb/db_command.c#3 integrate
.. //depot/projects/jail2/sys/ddb/db_output.c#2 integrate
.. //depot/projects/jail2/sys/ddb/db_output.h#2 integrate
.. //depot/projects/jail2/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/jail2/sys/ddb/db_thread.c#2 integrate
.. //depot/projects/jail2/sys/ddb/ddb.h#2 integrate
.. //depot/projects/jail2/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/Osd/OsdMemory.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_dock.c#3 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_perf.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/jail2/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/jail2/sys/dev/arl/if_arlreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/asr/MAINTAINER#2 delete
.. //depot/projects/jail2/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/jail2/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.h#2 integrate
.. //depot/projects/jail2/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/jail2/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/jail2/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/jail2/sys/dev/atkbdc/atkbdc_isa.c#2 integrate
.. //depot/projects/jail2/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/jail2/sys/dev/bktr/CHANGELOG.TXT#2 integrate
.. //depot/projects/jail2/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/dc/pnphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/jail2/sys/dev/em/README#2 integrate
.. //depot/projects/jail2/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/jail2/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/jail2/sys/dev/em/if_em_hw.c#2 integrate
.. //depot/projects/jail2/sys/dev/em/if_em_hw.h#2 integrate
.. //depot/projects/jail2/sys/dev/em/if_em_osdep.h#2 integrate
.. //depot/projects/jail2/sys/dev/exca/excareg.h#2 integrate
.. //depot/projects/jail2/sys/dev/fdc/fdc.c#2 integrate
.. //depot/projects/jail2/sys/dev/fe/if_fe.c#2 integrate
.. //depot/projects/jail2/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/jail2/sys/dev/ic/nec765.h#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iic.c#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iic.h#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iicbus.h#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iicbus_if.m#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iiconf.c#2 integrate
.. //depot/projects/jail2/sys/dev/iicbus/iiconf.h#2 integrate
.. //depot/projects/jail2/sys/dev/ips/ips.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_ioctl.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_library.c#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_target.c#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_target.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_tpublic.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/ispmbox.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/ispreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/jail2/sys/dev/ispfw/asm_1040.h#2 integrate
.. //depot/projects/jail2/sys/dev/ispfw/asm_1080.h#2 integrate
.. //depot/projects/jail2/sys/dev/ispfw/asm_12160.h#2 integrate
.. //depot/projects/jail2/sys/dev/ispfw/asm_2322.h#1 branch
.. //depot/projects/jail2/sys/dev/ispfw/ispfw.c#2 integrate
.. //depot/projects/jail2/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/jail2/sys/dev/ixgb/if_ixgb.c#2 integrate
.. //depot/projects/jail2/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/jail2/sys/dev/lmc/if_lmc.c#2 integrate
.. //depot/projects/jail2/sys/dev/lmc/if_lmc.h#2 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/jail2/sys/dev/mii/acphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/bmtphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/exphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/gentbi.c#1 branch
.. //depot/projects/jail2/sys/dev/mii/inphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/ip1000phy.c#1 branch
.. //depot/projects/jail2/sys/dev/mii/ip1000phyreg.h#1 branch
.. //depot/projects/jail2/sys/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/jail2/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/pnaphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/qsphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/rgephy.c#3 integrate
.. //depot/projects/jail2/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/ruephy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/ukphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_raid.h#2 integrate
.. //depot/projects/jail2/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/jail2/sys/dev/ncv/ncr53c500_pccard.c#2 integrate
.. //depot/projects/jail2/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/jail2/sys/dev/patm/if_patm_intr.c#2 integrate
.. //depot/projects/jail2/sys/dev/pccard/pccard_cis.c#2 integrate
.. //depot/projects/jail2/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/jail2/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/jail2/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/pccbb/pccbbreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/jail2/sys/dev/powermac_nvram/powermac_nvram.c#1 branch
.. //depot/projects/jail2/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch
.. //depot/projects/jail2/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/jail2/sys/dev/puc/puc_cfg.c#2 integrate
.. //depot/projects/jail2/sys/dev/puc/puc_pccard.c#2 integrate
.. //depot/projects/jail2/sys/dev/puc/puc_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/jail2/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/jail2/sys/dev/random/probe.c#2 integrate
.. //depot/projects/jail2/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/jail2/sys/dev/scc/scc_core.c#2 integrate
.. //depot/projects/jail2/sys/dev/scc/scc_dev_z8530.c#2 integrate
.. //depot/projects/jail2/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/jail2/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/jail2/sys/dev/sk/if_skreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/sound/driver.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/midi/sequencer.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/emu10kx-midi.c#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/emu10kx-pcm.c#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/emu10kx.c#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/emu10kx.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/ich.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/solo.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/buffer.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/buffer.h#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/jail2/sys/dev/spibus/spi.h#1 branch
.. //depot/projects/jail2/sys/dev/spibus/spibus.c#1 branch
.. //depot/projects/jail2/sys/dev/spibus/spibus_if.m#1 branch
.. //depot/projects/jail2/sys/dev/spibus/spibusvar.h#1 branch
.. //depot/projects/jail2/sys/dev/stg/tmc18c30_subr.c#2 integrate
.. //depot/projects/jail2/sys/dev/stge/if_stge.c#1 branch
.. //depot/projects/jail2/sys/dev/stge/if_stgereg.h#1 branch
.. //depot/projects/jail2/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/jail2/sys/dev/sym/sym_fw1.h#2 integrate
.. //depot/projects/jail2/sys/dev/sym/sym_fw2.h#2 integrate
.. //depot/projects/jail2/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_cpu_powerpc.c#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/jail2/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/jail2/sys/dev/usb/if_aue.c#2 integrate
.. //depot/projects/jail2/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/jail2/sys/dev/usb/uplcom.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/jail2/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/jail2/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/jail2/sys/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/jail2/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/jail2/sys/dev/wi/if_wireg.h#2 integrate
.. //depot/projects/jail2/sys/doc/Doxyfile#2 delete
.. //depot/projects/jail2/sys/doc/Makefile#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Dependencies#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-cam#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-crypto#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-dev_pci#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-dev_sound#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-dev_usb#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-geom#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-i4b#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-kern#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-linux#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-net80211#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-netgraph#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-netinet#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-netinet6#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-netipsec#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-opencrypto#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Doxyfile-vm#2 delete
.. //depot/projects/jail2/sys/doc/subsys/Makefile#2 delete
.. //depot/projects/jail2/sys/doc/subsys/README#2 delete
.. //depot/projects/jail2/sys/doc/subsys/common-Doxyfile#2 delete
.. //depot/projects/jail2/sys/doc/subsys/notreviewed.dox#2 delete
.. //depot/projects/jail2/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/jail2/sys/fs/hpfs/hpfs.h#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/jail2/sys/fs/portalfs/portal_vnops.c#2 integrate
.. //depot/projects/jail2/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/jail2/sys/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/jail2/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/udf/ecma167-udf.h#2 integrate
.. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/jail2/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/jail2/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/jail2/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/jail2/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/jail2/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/jail2/sys/geom/eli/g_eli_integrity.c#2 integrate
.. //depot/projects/jail2/sys/geom/geom.h#2 integrate
.. //depot/projects/jail2/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/jail2/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/jail2/sys/geom/label/g_label_msdosfs.c#2 integrate
.. //depot/projects/jail2/sys/geom/label/g_label_msdosfs.h#1 branch
.. //depot/projects/jail2/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/jail2/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/jail2/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/jail2/sys/geom/raid3/g_raid3_ctl.c#2 integrate
.. //depot/projects/jail2/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/jail2/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete
.. //depot/projects/jail2/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/jail2/sys/gnu/dev/sound/pci/emu10k1.h#2 delete
.. //depot/projects/jail2/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch
.. //depot/projects/jail2/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch
.. //depot/projects/jail2/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/jail2/sys/i386/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/jail2/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/jail2/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/jail2/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/jail2/sys/i386/conf/PAE#2 integrate
.. //depot/projects/jail2/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/jail2/sys/i386/i386/db_trace.c#4 integrate
.. //depot/projects/jail2/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/jail2/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/jail2/sys/i386/i386/support.s#2 integrate
.. //depot/projects/jail2/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/jail2/sys/i386/i386/tsc.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_isc.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_msg.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_other.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_poll.h#2 delete
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_util.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/imgact_coff.c#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/syscalls.conf#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/syscalls.isc#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/syscalls.isc.conf#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/syscalls.master#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/syscalls.xenix#2 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate
.. //depot/projects/jail2/sys/i386/include/i4b_ioctl.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/specialreg.h#3 integrate
.. //depot/projects/jail2/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/jail2/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_dummy.c#3 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/jail2/sys/i386/linux/syscalls.conf#2 integrate
.. //depot/projects/jail2/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/jail2/sys/i386/xbox/xbox.c#2 integrate
.. //depot/projects/jail2/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate
.. //depot/projects/jail2/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/jail2/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/jail2/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/jail2/sys/ia64/ia32/ia32_trap.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/emulate.c#1 branch
.. //depot/projects/jail2/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/jail2/sys/ia64/include/ieeefp.h#2 integrate
.. //depot/projects/jail2/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/jail2/sys/ia64/include/pmap.h#2 integrate
.. //depot/projects/jail2/sys/isa/isahint.c#2 integrate
.. //depot/projects/jail2/sys/kern/Makefile#2 integrate
.. //depot/projects/jail2/sys/kern/bus_if.m#2 integrate
.. //depot/projects/jail2/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_acl.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_ktr.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_prot.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_syscalls.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_tc.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_time.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/jail2/sys/kern/link_elf.c#3 integrate
.. //depot/projects/jail2/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/jail2/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/jail2/sys/kern/sched_core.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_acl_posix1e.c#1 branch
.. //depot/projects/jail2/sys/kern/subr_autoconf.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/jail2/sys/kern/subr_hints.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/jail2/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/jail2/sys/kern/sys_process.c#2 integrate
.. //depot/projects/jail2/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/jail2/sys/kern/syscalls.c#2 integrate
.. //depot/projects/jail2/sys/kern/syscalls.master#2 integrate
.. //depot/projects/jail2/sys/kern/systrace_args.c#1 branch
.. //depot/projects/jail2/sys/kern/sysv_sem.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/jail2/sys/kern/uipc_proto.c#2 delete
.. //depot/projects/jail2/sys/kern/uipc_sem.c#2 integrate
.. //depot/projects/jail2/sys/kern/uipc_sockbuf.c#1 branch
.. //depot/projects/jail2/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/jail2/sys/kern/uipc_socket2.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/jail2/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/jail2/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/jail2/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/jail2/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/jail2/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/jail2/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/jail2/sys/libkern/strstr.c#1 branch
.. //depot/projects/jail2/sys/modules/Makefile#4 integrate
.. //depot/projects/jail2/sys/modules/agp/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/asr/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/bktr/bktr_mem/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/bridgestp/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/if_bridge/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/if_ef/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/if_ppp/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/ispfw/isp_1000/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_1040/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_1040_it/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_1080/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_1080_it/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_12160/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_12160_it/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_2100/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_2200/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_2300/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/isp_2322/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ispfw/ispfw/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/linprocfs/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/linsysfs/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/linux/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/netgraph/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/netgraph/mppc/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/netgraph/tag/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/osf1/Makefile#2 delete
.. //depot/projects/jail2/sys/modules/padlock/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/powermac_nvram/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/sound/driver/Makefile#3 integrate
.. //depot/projects/jail2/sys/modules/sound/driver/emu10kx/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/sound/sound/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/stge/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/streams/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/svr4/Makefile#2 integrate
.. //depot/projects/jail2/sys/net/bpf.c#2 integrate
.. //depot/projects/jail2/sys/net/bridgestp.c#2 integrate
.. //depot/projects/jail2/sys/net/bridgestp.h#1 branch
.. //depot/projects/jail2/sys/net/if.c#4 integrate
.. //depot/projects/jail2/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/jail2/sys/net/if_bridge.c#3 integrate
.. //depot/projects/jail2/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/jail2/sys/net/if_clone.c#3 integrate
.. //depot/projects/jail2/sys/net/if_clone.h#2 integrate
.. //depot/projects/jail2/sys/net/if_disc.c#2 integrate
.. //depot/projects/jail2/sys/net/if_enc.c#2 integrate
.. //depot/projects/jail2/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/jail2/sys/net/if_faith.c#2 integrate
.. //depot/projects/jail2/sys/net/if_gif.c#2 integrate
.. //depot/projects/jail2/sys/net/if_gre.c#2 integrate
.. //depot/projects/jail2/sys/net/if_loop.c#2 integrate
.. //depot/projects/jail2/sys/net/if_ppp.c#2 integrate
.. //depot/projects/jail2/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/jail2/sys/net/if_stf.c#2 integrate
.. //depot/projects/jail2/sys/net/if_tap.c#2 integrate
.. //depot/projects/jail2/sys/net/if_tun.c#2 integrate
.. //depot/projects/jail2/sys/net/if_var.h#3 integrate
.. //depot/projects/jail2/sys/net/if_vlan.c#3 integrate
.. //depot/projects/jail2/sys/net/net_osdep.h#2 delete
.. //depot/projects/jail2/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/jail2/sys/net/rtsock.c#3 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_pcb.c#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_usrreq.c#2 integrate
.. //depot/projects/jail2/sys/netatm/atm_aal5.c#2 integrate
.. //depot/projects/jail2/sys/netatm/atm_usrreq.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_pppoe.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_tag.c#1 branch
.. //depot/projects/jail2/sys/netgraph/ng_tag.h#1 branch
.. //depot/projects/jail2/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/jail2/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/jail2/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/jail2/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/jail2/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_encap.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/jail2/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/libalias.3#2 integrate
.. //depot/projects/jail2/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/jail2/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/jail2/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/jail2/sys/netinet/tcp_timer.c#2 integrate
.. //depot/projects/jail2/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/jail2/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/jail2/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/README#2 delete
.. //depot/projects/jail2/sys/netinet6/ah_aesxcbcmac.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ah_core.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ah_input.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ah_output.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/esp_aesctr.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/esp_core.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/esp_input.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/esp_output.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/esp_rijndael.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/icmp6.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/in6.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/in6_var.h#2 integrate
.. //depot/projects/jail2/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ipcomp_core.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ipcomp_input.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ipcomp_output.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/ipsec.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/udp6_output.c#2 integrate
.. //depot/projects/jail2/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/jail2/sys/netipsec/ipsec_osdep.h#2 integrate
.. //depot/projects/jail2/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_usrreq.c#2 integrate
.. //depot/projects/jail2/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/jail2/sys/netkey/key.c#2 integrate
.. //depot/projects/jail2/sys/netkey/keydb.c#2 integrate
.. //depot/projects/jail2/sys/netkey/keysock.c#2 integrate
.. //depot/projects/jail2/sys/netnatm/natm.c#2 integrate
.. //depot/projects/jail2/sys/netncp/ncp_sock.c#2 integrate
.. //depot/projects/jail2/sys/netsmb/smb_conn.c#2 integrate
.. //depot/projects/jail2/sys/netsmb/smb_trantcp.c#2 integrate
.. //depot/projects/jail2/sys/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/jail2/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs.h#2 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/jail2/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/jail2/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/jail2/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/jail2/sys/pc98/include/md_var.h#2 integrate
.. //depot/projects/jail2/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/jail2/sys/pc98/pc98/pc98_machdep.c#2 integrate
.. //depot/projects/jail2/sys/pci/agp.c#2 integrate
.. //depot/projects/jail2/sys/pci/agp_i810.c#3 integrate
.. //depot/projects/jail2/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/jail2/sys/pci/if_xl.c#2 integrate
.. //depot/projects/jail2/sys/pci/ncr.c#2 integrate
.. //depot/projects/jail2/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/jail2/sys/posix4/ksched.c#2 integrate
.. //depot/projects/jail2/sys/posix4/p1003_1b.c#2 integrate
.. //depot/projects/jail2/sys/posix4/posix4.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/jail2/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/jail2/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/include/ofw_machdep.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/include/pcb.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/mem.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/mmu_oea.c#3 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/ofw_machdep.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/psim/sio_iobus.c#2 delete
.. //depot/projects/jail2/sys/powerpc/psim/uart_iobus.c#1 branch
.. //depot/projects/jail2/sys/security/audit/audit.h#2 integrate
.. //depot/projects/jail2/sys/security/audit/audit_arg.c#2 integrate
.. //depot/projects/jail2/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/jail2/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/jail2/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/jail2/sys/sparc64/conf/NOTES#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/pmap.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/jail2/sys/sys/_label.h#2 integrate
.. //depot/projects/jail2/sys/sys/bufobj.h#2 integrate
.. //depot/projects/jail2/sys/sys/bus.h#2 integrate
.. //depot/projects/jail2/sys/sys/dirent.h#2 integrate
.. //depot/projects/jail2/sys/sys/domain.h#2 integrate
.. //depot/projects/jail2/sys/sys/eventhandler.h#2 integrate
.. //depot/projects/jail2/sys/sys/extattr.h#2 integrate
.. //depot/projects/jail2/sys/sys/imgact.h#2 integrate
.. //depot/projects/jail2/sys/sys/kernel.h#3 integrate
.. //depot/projects/jail2/sys/sys/libkern.h#2 integrate
.. //depot/projects/jail2/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/jail2/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/jail2/sys/sys/mbuf.h#2 integrate
.. //depot/projects/jail2/sys/sys/mutex.h#2 integrate
.. //depot/projects/jail2/sys/sys/param.h#2 integrate
.. //depot/projects/jail2/sys/sys/protosw.h#3 integrate
.. //depot/projects/jail2/sys/sys/socket.h#2 integrate
.. //depot/projects/jail2/sys/sys/socketvar.h#3 integrate
.. //depot/projects/jail2/sys/sys/sockio.h#3 integrate
.. //depot/projects/jail2/sys/sys/stat.h#2 integrate
.. //depot/projects/jail2/sys/sys/sx.h#3 integrate
.. //depot/projects/jail2/sys/sys/syscall.h#2 integrate
.. //depot/projects/jail2/sys/sys/syscall.mk#2 integrate
.. //depot/projects/jail2/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/jail2/sys/sys/sysctl.h#2 integrate
.. //depot/projects/jail2/sys/sys/sysent.h#2 integrate
.. //depot/projects/jail2/sys/sys/sysproto.h#2 integrate
.. //depot/projects/jail2/sys/sys/systm.h#3 integrate
.. //depot/projects/jail2/sys/sys/thr.h#2 integrate
.. //depot/projects/jail2/sys/sys/time.h#2 integrate
.. //depot/projects/jail2/sys/sys/types.h#2 integrate
.. //depot/projects/jail2/sys/sys/unpcb.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/jail2/sys/vm/device_pager.c#2 integrate
.. //depot/projects/jail2/sys/vm/pmap.h#2 integrate
.. //depot/projects/jail2/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/jail2/sys/vm/uma_core.c#2 integrate
.. //depot/projects/jail2/sys/vm/vm.h#2 integrate
.. //depot/projects/jail2/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/jail2/sys/vm/vm_map.c#3 integrate
.. //depot/projects/jail2/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/jail2/sys/vm/vm_object.c#3 integrate
.. //depot/projects/jail2/sys/vm/vm_object.h#2 integrate
.. //depot/projects/jail2/sys/vm/vm_page.c#3 integrate
.. //depot/projects/jail2/sys/vm/vm_page.h#2 integrate
.. //depot/projects/jail2/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/jail2/sys/vm/vnode_pager.c#2 integrate

Differences ...

==== //depot/projects/jail2/j2_tools/jresource/jresource.c#3 (text+ko) ====

@@ -19,6 +19,7 @@
 #define C_IPCMSQ	JAIL2_COMMAND(J_RESOURCE,J_MSQLIMIT)
 #define C_IPCSHM	JAIL2_COMMAND(J_RESOURCE,J_SHMLIMIT)
 #define C_IPCSEM	JAIL2_COMMAND(J_RESOURCE,J_SEMLIMIT)
+#define C_FDLIM		JAIL2_COMMAND(J_RESOURCE,J_SETFILELIMIT)
 
 static int
 setlimit(int ctx, int cmd, char *data)
@@ -56,7 +57,8 @@
 		{"sysvshm",		required_argument,	NULL, C_IPCSHM},
 		{"sysvsem",		required_argument,	NULL, C_IPCSEM},
 		{"sysvmsq",		required_argument,	NULL, C_IPCMSQ},
-		{NULL,			0,					NULL, 0}
+		{"fdlimit",		required_argument,	NULL, C_FDLIM},
+		{NULL,			0,			NULL, 0}
 	};
 
 	while ((ch = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
@@ -70,6 +72,7 @@
 		case C_IPCSHM:
 		case C_IPCSEM:
 		case C_IPCMSQ:
+		case C_FDLIM:
 			setlimit(ctx_id, ch, optarg);
 			break;
 		default:

==== //depot/projects/jail2/sys/Makefile#2 (text+ko) ====

@@ -1,16 +1,14 @@
-# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $
 
 .include <bsd.own.mk>
 
 # The boot loader
 .if ${MK_BOOT} != "no"
-.if ${MACHINE_ARCH} != "arm"
 SUBDIR=	boot
 .endif
-.endif
 
 # Directories to include in cscope name file and TAGS.
-CSCOPEDIRS=	coda compat conf contrib crypto ddb dev fs gnu i4b isa \
+CSCOPEDIRS=	coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \
 		isofs kern libkern modules net net80211 netatalk netatm \
 		netgraph netinet netinet6 netipx netkey netnatm netncp \
 		netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \

==== //depot/projects/jail2/sys/amd64/acpica/madt.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.21 2006/08/11 19:22:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -203,15 +203,15 @@
 
 	/*
 	 * Map in the RSDP.  Since ACPI uses AcpiOsMapMemory() which in turn
-	 * calls pmap_mapdev() to find the RSDP, we assume that we can use
-	 * pmap_mapdev() to map the RSDP.
+	 * calls pmap_mapbios() to find the RSDP, we assume that we can use
+	 * pmap_mapbios() to map the RSDP.
 	 */
 	if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK)
 		return (ENXIO);
 #ifdef __i386__
 	KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high"));
 #endif
-	rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR));
+	rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR));
 	if (rsdp == NULL) {
 		if (bootverbose)
 			printf("MADT: Failed to map RSDP\n");
@@ -261,7 +261,7 @@
 				break;
 		madt_unmap_table(rsdt);
 	}
-	pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR));
+	pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR));
 	if (madt_physaddr == 0) {
 		if (bootverbose)
 			printf("MADT: No MADT table found\n");
@@ -335,7 +335,7 @@
 madt_setup_local(void)
 {
 
-	madt = pmap_mapdev(madt_physaddr, madt_length);
+	madt = pmap_mapbios(madt_physaddr, madt_length);
 	lapic_init((uintptr_t)madt->LocalApicAddress);
 	printf("ACPI APIC Table: <%.*s %.*s>\n",
 	    (int)sizeof(madt->OemId), madt->OemId,

==== //depot/projects/jail2/sys/amd64/amd64/db_trace.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -390,16 +390,14 @@
 	long *argp;

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608261856.k7QIujSv001956>