diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-07-05 16:54:46 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-07-05 16:54:46 -0400 |
| commit | 586824c5d718609e395e15b0a92824ba9794397d (patch) | |
| tree | 7be304e8ef8a0894d5dc93f94d87df32cab92390 /exception_lists | |
| parent | 4fb2ab974a5dc6aeb68146a4f5ff4c7ccbe90667 (diff) | |
| parent | 2c0ebdee8f56c8a9d9e34e30367999396b38fec9 (diff) | |
| download | illumos-joyent-586824c5d718609e395e15b0a92824ba9794397d.tar.gz | |
[illumos-gate merge]
commit 2c0ebdee8f56c8a9d9e34e30367999396b38fec9
14273 Want MAC ring manual pages
commit ceb3ef192e9bccf08d1bcd0ae5ed520cecccff3d
12389 loader should consult with ACPI SPCR table for serial console
commit 6446bd46ed1b4e9f69da153665f82181ccaedad5
14770 ld(1) should be 64bit only
commit 7d10cd4ddf12f982d3bc7edcd01cc8b8d1dcc464
14767 retire kssl
commit 33b27906b01ade9752c1935377f3fefdf49b8f95
14764 AHCI DEVSLEEP 1.3.1 problematic
Conflicts:
usr/src/cmd/devfsadm/misc_link.c
usr/src/cmd/truss/codes.c
usr/src/uts/common/Makefile.files
usr/src/uts/intel/Makefile.intel
usr/src/uts/sparc/Makefile.sparc
Diffstat (limited to 'exception_lists')
| -rw-r--r-- | exception_lists/packaging | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging index dc81d8238c..3c49866785 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -22,7 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2014 Garrett D'Amore <garrett@damore.org> +# Copyright 2022 Garrett D'Amore <garrett@damore.org> # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> # Copyright 2017 Toomas Soome <tsoome@me.com> # Copyright 2017 RackTop Systems. @@ -267,9 +267,6 @@ usr/lib/mdb/proc/sparcv9/mdb_test.so sparc # # SNCA project exception list # -usr/include/inet/kssl/kssl.h -usr/include/inet/kssl/ksslimpl.h -usr/include/inet/kssl/ksslproto.h usr/include/inet/nca # # these are "removed" from the source product build because the only |