[illumos-gate merge]

commit ce3c309f71f6893197099bfac06adb66f0870d7d
    872 remove duplicate daemon() definitions
commit a1cf91d7adb92b3440a7ed1b01e3170ec61e9350
    5644 rpcinfo(1m): The first synopsis supports the -T option too
commit ff3aea39f71c371be25b08deb9efed41f1c95983
    5639 want reentrant ether_aton_r and ether_ntoa_r
commit bfce16ba853698e8a82133cf3ddb3ff143d14289
    5627 svccfg export should accept instance FMRIs
commit 1a902ef8628b0dffd6df5442354ab59bb8530962
    5561 support root pools on EFI/GPT partitioned disks
    5125 update zpool/libzfs to manage bootable whole disk pools (EFI/GPT labeled disks)
commit 44bc9120699af80bb18366ca474cb2c618608ca9
    5560 grub should support EFI/GPT partitioning
commit b0e753dd6a955fb2f10a0ce17d32bd33172e0400
    5609 port mod_ipp to Apache 2.2

	Conflicts:
	usr/src/lib/print/mod_ipp/Makefile
	exception_lists/cstyle

5 files changed, 12 insertions, 2 deletions

diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index fce897b09b..0fbbfb639e 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -47,7 +47,6 @@ SKIP		^usr/src/			# no objects in source code
 
 # Individual files that we don't examine
 SKIP		^boot/grub/bin/grub$
-SKIP		^usr/apache/libexec/mod_ipp.so$	# Apache loadable module
 # USIII specific extns. cause ldd noise on USII bld. m/c
 SKIP		^usr/lib/fps/sun4u/UltraSPARC.*/fptest$
 SKIP		^usr/MACH(lib)/lddstub$		# lddstub has no dependencies
diff --git a/exception_lists/copyright b/exception_lists/copyright
index 37c48c548f..4f3c232f39 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -68,6 +68,11 @@ usr/src/common/bzip2/huffman.c
 usr/src/common/openssl/crypto/krb5/krb5_asn.c
 usr/src/common/openssl/crypto/krb5/krb5_asn.h
 usr/src/grub/grub-0.97/stage2/Makefile.am
+usr/src/grub/grub-0.97/stage2/builtins.c
+usr/src/grub/grub-0.97/stage2/disk_io.c
+usr/src/grub/grub-0.97/stage2/pc_slice.h
+usr/src/grub/grub-0.97/stage2/gpt.h
+usr/src/grub/grub-0.97/stage2/shared.h
 usr/src/lib/gss_mechs/mech_krb5/crypto/cksumtype_to_string.c
 usr/src/lib/gss_mechs/mech_krb5/crypto/coll_proof_cksum.c
 usr/src/lib/gss_mechs/mech_krb5/crypto/enctype_compare.c
diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index 67bbe870f0..410608488e 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -126,6 +126,11 @@ usr/src/common/bzip2/huffman.c
 usr/src/common/crypto/chacha/chacha.c
 usr/src/common/openssl/crypto/krb5/krb5_asn.c
 usr/src/common/openssl/crypto/krb5/krb5_asn.h
+usr/src/grub/grub-0.97/stage2/builtins.c
+usr/src/grub/grub-0.97/stage2/disk_io.c
+usr/src/grub/grub-0.97/stage2/pc_slice.h
+usr/src/grub/grub-0.97/stage2/gpt.h
+usr/src/grub/grub-0.97/stage2/shared.h
 usr/src/lib/libc/port/gen/arc4random_uniform.c
 usr/src/lib/gss_mechs/mech_krb5/crypto/aes/aes_s2k.c
 usr/src/lib/gss_mechs/mech_krb5/crypto/cksumtype_to_string.c
diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk
index 1259c43949..0c8d0286ef 100644
--- a/exception_lists/hdrchk
+++ b/exception_lists/hdrchk
@@ -30,6 +30,7 @@ usr/src/cmd/mandoc/mdoc.h
 usr/src/cmd/mandoc/out.h
 usr/src/cmd/mandoc/term.h
 usr/src/common/openssl/crypto/krb5/krb5_asn.h
+usr/src/grub/grub-0.97/stage2/shared.h
 usr/src/lib/gss_mechs/mech_krb5/et/error_table.h
 usr/src/lib/gss_mechs/mech_krb5/et/internal.h
 usr/src/lib/gss_mechs/mech_krb5/et/mit-sipb-copyright.h
diff --git a/exception_lists/interface_check b/exception_lists/interface_check
index 377aa4b387..311bed5bc6 100644
--- a/exception_lists/interface_check
+++ b/exception_lists/interface_check
@@ -43,7 +43,6 @@
 # Plugins are not required to have versioned file names, and are not required
 # to be internally versioned.
 #
-PLUGIN		^usr/apache/libexec
 PLUGIN		^usr/lib/devfsadm
 PLUGIN		^usr/lib/efcode/.*\.so$
 PLUGIN		^usr/lib/elfedit
@@ -53,6 +52,7 @@ PLUGIN		^usr/lib/fm/topo/plugins
 PLUGIN		^usr/lib/fwflash
 PLUGIN		^usr/lib/iconv
 PLUGIN		^usr/lib/inet/ppp
+PLUGIN		^usr/lib/lp/ipp
 PLUGIN		^usr/lib/mdb
 PLUGIN		^usr/lib/pci
 PLUGIN		^usr/lib/picl/plugins