Merge remote-tracking branch 'illumos-ml/master' into titanic

Some zev merge conflicts fixed.

Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c

4072 make clobber leaves trash
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Richard Low

4072 make clobber leaves trash
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>

show more ...

2933 compiler warning gags need better granularity
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>

PSARC/2009/232 Solaris Packet Capture
PSARC/2009/403 kstats for ipnet
6824047 every downcall function should have a "notsupported" function
6822740 RFE: provide PF_PACKET for developers on OpenSolari

PSARC/2009/232 Solaris Packet Capture
PSARC/2009/403 kstats for ipnet
6824047 every downcall function should have a "notsupported" function
6822740 RFE: provide PF_PACKET for developers on OpenSolaris
6822741 RFE: Solaris needs BPF to improve the packet capture story
6867683 RFE: need to be able to retrieve physical interface flags

show more ...

PSARC/2006/357 Crossbow - Network Virtualization and Resource Management
6498311 Crossbow - Network Virtualization and Resource Management
6402493 DLPI provider loopback behavior should be improved
6

PSARC/2006/357 Crossbow - Network Virtualization and Resource Management
6498311 Crossbow - Network Virtualization and Resource Management
6402493 DLPI provider loopback behavior should be improved
6453165 move mac capabs definitions outside mac.h
6338667 Need ability to use NAT for non-global zones
6692884 several threads hung due to deadlock scenario between aggr and mac
6768302 dls: soft_ring_bind/unbind race can panic in thread_affinity_set with cpu_id == -1
6635849 race between lacp_xmit_sm() and aggr_m_stop() ends in panic
6742712 potential message double free in the aggr driver
6754299 a potential race between aggr_m_tx() and aggr_port_delete()
6485324 mi_data_lock recursively held when enabling promiscuous mode on an aggregation
6442559 Forwarding perf bottleneck due to mac_rx() calls
6505462 assertion failure after removing a port from a snooped aggregation
6716664 need to add src/dst IP address to soft ring fanout

--HG--
rename : usr/src/uts/common/io/dls/dls_soft_ring.c => usr/src/uts/common/io/mac/mac_soft_ring.c
rename : usr/src/uts/common/inet/ip/ip_cksum.c => usr/src/uts/common/os/ip_cksum.c
rename : usr/src/uts/common/inet/sctp_crc32.c => usr/src/uts/common/os/sctp_crc32.c
rename : usr/src/uts/common/sys/dls_soft_ring.h => usr/src/uts/common/sys/mac_soft_ring.h

show more ...

6519043 IP instances sis_check should support automatic checking in nightly
6519047 IP instances sis_check does not have descriptive symbol file names

--HG--
rename : usr/src/uts/intel/arp/arp.objt-

6519043 IP instances sis_check should support automatic checking in nightly
6519047 IP instances sis_check does not have descriptive symbol file names

--HG--
rename : usr/src/uts/intel/arp/arp.objt-symbols.obj64 => usr/src/uts/intel/arp/arp.global-objs.debug64
rename : usr/src/uts/intel/hook/hook.objt-symbols.obj64 => usr/src/uts/intel/hook/hook.global-objs.debug64
rename : usr/src/uts/intel/icmp/icmp.objt-symbols.obj64 => usr/src/uts/intel/icmp/icmp.global-objs.debug64
rename : usr/src/uts/intel/ip/ip.objt-symbols.debug64 => usr/src/uts/intel/ip/ip.global-objs.debug64
rename : usr/src/uts/intel/ip/ip.objt-symbols.obj64 => usr/src/uts/intel/ip/ip.global-objs.obj64
rename : usr/src/uts/intel/ipf/ipf.objt-symbols.obj64 => usr/src/uts/intel/ipf/ipf.global-objs.debug64
rename : usr/src/uts/intel/ipsecah/ipsecah.objt-symbols.obj64 => usr/src/uts/intel/ipsecah/ipsecah.global-objs.debug64
rename : usr/src/uts/intel/ipsecesp/ipsecesp.objt-symbols.obj64 => usr/src/uts/intel/ipsecesp/ipsecesp.global-objs.debug64
rename : usr/src/uts/intel/keysock/keysock.objt-symbols.obj64 => usr/src/uts/intel/keysock/keysock.global-objs.debug64
rename : usr/src/uts/intel/neti/neti.objt-symbols.obj64 => usr/src/uts/intel/neti/neti.global-objs.debug64
rename : usr/src/uts/intel/rts/rts.objt-symbols.obj64 => usr/src/uts/intel/rts/rts.global-objs.debug64
rename : usr/src/uts/intel/spdsock/spdsock.objt-symbols.obj64 => usr/src/uts/intel/spdsock/spdsock.global-objs.debug64
rename : usr/src/uts/intel/tun/tun.objt-symbols.obj64 => usr/src/uts/intel/tun/tun.global-objs.debug64
rename : usr/src/uts/sparc/arp/arp.objt-symbols.obj64 => usr/src/uts/sparc/arp/arp.global-objs.debug64
rename : usr/src/uts/sparc/hook/hook.objt-symbols.obj64 => usr/src/uts/sparc/hook/hook.global-objs.debug64
rename : usr/src/uts/sparc/icmp/icmp.objt-symbols.obj64 => usr/src/uts/sparc/icmp/icmp.global-objs.debug64
rename : usr/src/uts/sparc/ip/ip.objt-symbols.debug64 => usr/src/uts/sparc/ip/ip.global-objs.debug64
rename : usr/src/uts/sparc/ip/ip.objt-symbols.obj64 => usr/src/uts/sparc/ip/ip.global-objs.obj64
rename : usr/src/uts/sparc/ipsecah/ipsecah.objt-symbols.obj64 => usr/src/uts/sparc/ipsecah/ipsecah.global-objs.debug64
rename : usr/src/uts/sparc/ipsecesp/ipsecesp.objt-symbols.obj64 => usr/src/uts/sparc/ipsecesp/ipsecesp.global-objs.debug64
rename : usr/src/uts/sparc/keysock/keysock.objt-symbols.obj64 => usr/src/uts/sparc/keysock/keysock.global-objs.debug64
rename : usr/src/uts/sparc/neti/neti.objt-symbols.obj64 => usr/src/uts/sparc/neti/neti.global-objs.debug64
rename : usr/src/uts/sparc/rts/rts.objt-symbols.obj64 => usr/src/uts/sparc/rts/rts.global-objs.debug64
rename : usr/src/uts/sparc/spdsock/spdsock.objt-symbols.obj64 => usr/src/uts/sparc/spdsock/spdsock.global-objs.debug64
rename : usr/src/uts/sparc/tun/tun.objt-symbols.obj64 => usr/src/uts/sparc/tun/tun.global-objs.debug64

show more ...

PSARC 2006/366 IP Instances
6289221 RFE: Need virtualized ip-stack for each local zone
6512601 panic in ipsec_in_tag - allocation failure
6514637 error message from dhcpagent: add_pkt_opt: option typ

PSARC 2006/366 IP Instances
6289221 RFE: Need virtualized ip-stack for each local zone
6512601 panic in ipsec_in_tag - allocation failure
6514637 error message from dhcpagent: add_pkt_opt: option type 60 is missing required value
6364643 RFE: allow persistent setting of interface flags per zone
6307539 RFE: Invalid network address causes zone boot failure
5041214 Allow IPMP configuration with zones
5005887 RFE: zoneadmd should support plumbing an interface via DHCP
4991139 RFE: zones should provide a mechanism to configure a defaultrouter for a zone
6218378 zoneadmd doesn't set the netmask for non-loopback addresses hosted on lo0
4963280 zones: need to virtualize the IPv6 default address selection mechanism
4963285 zones: need support of stateless address autoconfiguration for IPv6
5048068 zones don't boot if one of its interfaces has failed
5057154 RFE: ability to change interface status from within a zone
4963287 zones should support the plumbing of the first (and only) logical interface
4978517 TCP privileged port space should be partitioned per zone
5023347 zones don't work well with network routes other than default
4963372 investigate whether global zone can act as a router for local zones
6378364 RFE: Allow each zone to have its own virtual IPFilter

show more ...

6470037 remove global disable of some potentially useful lint warnings from the kernel lint build

PSARC/2005/334 Packet Filtering Hooks
PSARC/2006/321 ARP packet filtering Hooks
6401219 use of pullupmsg() considered destructive - clears h/w checksum flags
6418698 PSARC/2005/334 - Packet Filtering

PSARC/2005/334 Packet Filtering Hooks
PSARC/2006/321 ARP packet filtering Hooks
6401219 use of pullupmsg() considered destructive - clears h/w checksum flags
6418698 PSARC/2005/334 - Packet Filtering Hooks API
6449290 package prototype files in usr/src/pkgdefs/SUNWipfr missing CDDL
6449292 package prototype files in usr/src/pkgdefs/SUNWipfu missing CDDL
6449296 Makefiles for ipf kernel module building missing CDDL
6473996 "fastroute" + "nat" packets cause memory leaks in ipfilter

--HG--
rename : usr/src/cmd/ipf/etc/pfil.ap.sh => deleted_files/usr/src/cmd/ipf/etc/pfil.ap.sh
rename : usr/src/cmd/ipf/pfild/Makefile => deleted_files/usr/src/cmd/ipf/pfild/Makefile
rename : usr/src/cmd/ipf/pfild/pfild.c => deleted_files/usr/src/cmd/ipf/pfild/pfild.c
rename : usr/src/cmd/ipf/pfild/vas.c => deleted_files/usr/src/cmd/ipf/pfild/vas.c
rename : usr/src/cmd/ipf/svc/pfil => deleted_files/usr/src/cmd/ipf/svc/pfil
rename : usr/src/cmd/ipf/svc/pfil.xml => deleted_files/usr/src/cmd/ipf/svc/pfil.xml
rename : usr/src/uts/common/inet/pfil/compat.h => deleted_files/usr/src/uts/common/inet/pfil/compat.h
rename : usr/src/uts/common/inet/pfil/ndd.c => deleted_files/usr/src/uts/common/inet/pfil/ndd.c
rename : usr/src/uts/common/inet/pfil/os.h => deleted_files/usr/src/uts/common/inet/pfil/os.h
rename : usr/src/uts/common/inet/pfil/pfil.c => deleted_files/usr/src/uts/common/inet/pfil/pfil.c
rename : usr/src/uts/common/inet/pfil/pfil.conf => deleted_files/usr/src/uts/common/inet/pfil/pfil.conf
rename : usr/src/uts/common/inet/pfil/pfil.h => deleted_files/usr/src/uts/common/inet/pfil/pfil.h
rename : usr/src/uts/common/inet/pfil/pfild.h => deleted_files/usr/src/uts/common/inet/pfil/pfild.h
rename : usr/src/uts/common/inet/pfil/pfildrv.c => deleted_files/usr/src/uts/common/inet/pfil/pfildrv.c
rename : usr/src/uts/common/inet/pfil/pfilstream.c => deleted_files/usr/src/uts/common/inet/pfil/pfilstream.c
rename : usr/src/uts/common/inet/pfil/pkt.c => deleted_files/usr/src/uts/common/inet/pfil/pkt.c
rename : usr/src/uts/common/inet/pfil/qif.c => deleted_files/usr/src/uts/common/inet/pfil/qif.c
rename : usr/src/uts/common/inet/pfil/qif.h => deleted_files/usr/src/uts/common/inet/pfil/qif.h
rename : usr/src/uts/intel/pfil/Makefile => deleted_files/usr/src/uts/intel/pfil/Makefile
rename : usr/src/uts/sparc/pfil/Makefile => deleted_files/usr/src/uts/sparc/pfil/Makefile
rename : usr/src/uts/common/inet/pfil/misc.c => usr/src/uts/common/inet/ipf/misc.c

show more ...

OpenSolaris Launch