summaryrefslogtreecommitdiff
path: root/exception_lists
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-09-30 11:58:49 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-09-30 11:58:49 +0000
commit0e76c6c0a22a418e6815894dabbb9e27852646b1 (patch)
tree15994c84ecfb1e84cdcc096a8811f0a0a143c577 /exception_lists
parent9025f331a2570d6d68b91bc20ea24ab6a5b9d8b4 (diff)
parent0ae9a84f82e18b30b7354ca5193afdbbb1cdc880 (diff)
downloadillumos-joyent-0e76c6c0a22a418e6815894dabbb9e27852646b1.tar.gz
[illumos-gate merge]
commit 0ae9a84f82e18b30b7354ca5193afdbbb1cdc880 7661 illumos should provide 64bit perl modules commit 2b292e00835d471d54a29c338155ab9d5756c18d 11717 loader.efi: efipart needs to use ioalign commit ed54d13f6e7749144a97912cccfadbfaf47f1523 11711 verify_pool missing from zfs-test suite commit 10ae99ee6a0e5168918d2bba208bcf536edb08f7 11667 remove duplicate lz4 implementations commit f2211ffec9a7ac3c1efc6de9347072f816f10a60 11749 nfs4_end_*_seqid_sync() should call cv_signal() commit 081aa5f609710eb34401f4494245119e2aca553f 11716 loader: add memalign() commit b6242eb47febde0b1450b13b626fae868830a828 11579 e1000g: cast between incompatible function types commit 8f97fda43d3ec24e515449b83c8a970b9042030a 11752 inet/cc.h should be shipped Conflicts: usr/src/lib/Makefile.lib usr/src/Makefile.master.64 usr/src/Makefile.master
Diffstat (limited to 'exception_lists')
-rw-r--r--exception_lists/packaging1
1 files changed, 0 insertions, 1 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging
index 9459a99623..e2f96e919e 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -137,7 +137,6 @@ usr/lib/llib-like.ln
usr/lib/amd64/llib-like.ln i386
usr/lib/sparcv9/llib-like.ln sparc
#
-usr/include/inet/cc.h
usr/include/inet/ip_impl.h
usr/include/inet/ip_ndp.h
usr/include/inet/ip2mac_impl.h