diff options
| author | Mike Zeller <mike@mikezeller.net> | 2020-04-30 12:05:53 -0400 |
|---|---|---|
| committer | Mike Zeller <mike@mikezeller.net> | 2020-04-30 12:05:53 -0400 |
| commit | ac392c47376cdb46e02be40735cc74d5d100fe6c (patch) | |
| tree | 450ea4b694961d00606485aa323234bb2ad69851 /exception_lists | |
| parent | 95a46e0bd62ba0e68db9fa0b958dc5313920e6fe (diff) | |
| parent | 0f8413a98e7949bf0a6a2c24153f2928c7eb5cfb (diff) | |
| download | illumos-joyent-OS-8165.tar.gz | |
Merge branch 'master' into OS-8165OS-8165
Diffstat (limited to 'exception_lists')
| -rw-r--r-- | exception_lists/copyright | 3 | ||||
| -rw-r--r-- | exception_lists/wscheck | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 01d3fc10bc..87c8de6ba4 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -25,6 +25,7 @@ # Copyright (c) 2011 by Delphix. All rights reserved. # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # Copyright (c) 2018, Joyent, Inc. +# Copyright 2020 Oxide Computer Company # syntax: glob @@ -410,6 +411,8 @@ usr/src/lib/libsmbfs/netsmb/spnego.h usr/src/lib/libsmbfs/smb/derparse.[ch] usr/src/lib/libsmbfs/smb/spnego.c usr/src/lib/libsmbfs/smb/spnegoparse.[ch] +usr/src/test/crypto-tests/tests/digest/data/*.rsp +usr/src/test/crypto-tests/tests/digest/data/README usr/src/test/util-tests/tests/dis/*/*.out usr/src/test/util-tests/tests/libsff/*.out usr/src/test/util-tests/tests/grep_xpg4/files/gout* diff --git a/exception_lists/wscheck b/exception_lists/wscheck index 4557595027..03f5ee691d 100644 --- a/exception_lists/wscheck +++ b/exception_lists/wscheck @@ -9,6 +9,7 @@ # http://www.illumos.org/license/CDDL. # # Copyright 2019 Joyent, Inc. +# Copyright 2020 Oxide Computer Company # syntax: glob @@ -105,6 +106,7 @@ usr/src/uts/i86pc/sys/vmm_dev.h usr/src/uts/i86pc/sys/vmm_instruction_emul.h usr/src/uts/common/io/qede/* usr/src/uts/common/io/i40e/core/* +usr/src/test/crypto-tests/tests/digest/data/*.rsp usr/src/test/util-tests/tests/dis/i386/*.out usr/src/tools/smatch/src/* usr/src/uts/common/io/cxgbe/* |