summaryrefslogtreecommitdiff
path: root/exception_lists
diff options
context:
space:
mode:
authorTim Foster <tim.foster@joyent.com>2019-10-25 13:00:51 +0000
committerTim Foster <tim.foster@joyent.com>2019-10-25 13:00:51 +0000
commitd86c9e6d4e922c695bb2793dddf0ea48d61ca963 (patch)
tree50a63b04f1ec2b82b50a21df278acff3f24b364e /exception_lists
parent29de67cafe15bb9e2c61bd58e6183182a7735036 (diff)
parent7284664a1faa361af4ff33ba5435d43d3ee07bf2 (diff)
downloadillumos-joyent-d86c9e6d4e922c695bb2793dddf0ea48d61ca963.tar.gz
[illumos-gate merge]
commit 7284664a1faa361af4ff33ba5435d43d3ee07bf2 11816 iscsi initiator gets confused if attached before root file system mount commit 55908bd733fe029d49237b91c700655997242419 11843 update Intel microcode to 20190918 commit b9c9c3595312927fb362936529c5679117843b93 11826 Buffer overflow and memory leak in "libbsm" commit 78a2e113edb6fe0a0382b403b55d92e8f0bba78f 9531 Want netstat -u to show PIDs associated with sockets 11707 provide 64-bit libdhcpagent 11708 netstat should be smatch and CERRWARN clean Conflicts: usr/src/data/ucode/Makefile usr/src/data/ucode/README.ucode usr/src/data/ucode/intel/000206D6-01 usr/src/data/ucode/intel/000206D7-01 usr/src/data/ucode/intel/000306D4-40 usr/src/data/ucode/intel/000306F4-80 usr/src/data/ucode/intel/00040671-02 usr/src/data/ucode/intel/000406F1-01 usr/src/data/ucode/intel/00050654-01 usr/src/data/ucode/intel/00050657-01 usr/src/data/ucode/intel/00050662-10 usr/src/data/ucode/intel/00050663-10 usr/src/data/ucode/intel/00050664-10 usr/src/data/ucode/intel/00050665-10 usr/src/data/ucode/intel/000506CA-01
Diffstat (limited to 'exception_lists')
-rw-r--r--exception_lists/packaging2
1 files changed, 2 insertions, 0 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging
index e2f96e919e..101d735400 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -200,6 +200,7 @@ usr/include/sys/kmdb.h
# for customer use, so the files are excluded from packaging.
#
lib/libdhcpagent.so
+lib/amd64/libdhcpagent.so
lib/libdhcputil.so
lib/amd64/libdhcputil.so i386
lib/sparcv9/libdhcputil.so sparc
@@ -212,6 +213,7 @@ usr/include/dhcpagent_ipc.h
usr/include/dhcpagent_util.h
usr/include/dhcpmsg.h
usr/lib/libdhcpagent.so
+usr/lib/amd64/libdhcpagent.so
usr/lib/libdhcputil.so
usr/lib/amd64/libdhcputil.so i386
usr/lib/sparcv9/libdhcputil.so sparc