diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-11-23 14:12:50 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-11-23 14:12:50 -0500 |
| commit | 97a17035ae6224196e076e91ecbffa8498786fbf (patch) | |
| tree | 05d66869ee153ea902e064d7261847e3f9ec4816 /exception_lists | |
| parent | 99582f15dd8ddfce645cd6baf0e92e6599fe4c7b (diff) | |
| parent | 6f443ebc1fb4fec01d6e8fa8ca4648182ed215bb (diff) | |
| download | illumos-joyent-97a17035ae6224196e076e91ecbffa8498786fbf.tar.gz | |
[illumos-gate merge]
commit 6f443ebc1fb4fec01d6e8fa8ca4648182ed215bb
13689 Want AWS ENA driver
commit a28480febf31f0e61debac062a55216a98a05a92
14208 zoneadmd should not inherit zoneadm's environment
commit b0de25cb23668fa4535078d18a0618eee442c000
14081 bhyve upstream sync 2021 September
commit 0554d5ecd11d9644cbb915be31b5a0b7abb40122
14229 secflags_dts relies on compiler defaults
commit 96bb5f330b9b75a0f74766485ffaf400a063a668
14256 package inc files should be pkgfmt v2 as well
Conflicts:
manifest
usr/src/cmd/bhyve/Makefile
usr/src/lib/libzonecfg/Makefile.com
usr/src/lib/libzonecfg/common/libzonecfg.c
usr/src/pkg/manifests/system-kernel.man9f.inc
usr/src/pkg/manifests/system-test-ostest.p5m
usr/src/test/os-tests/tests/secflags/secflags_dts.sh
usr/src/uts/intel/os/driver_aliases
usr/src/uts/intel/os/name_to_major
Diffstat (limited to 'exception_lists')
| -rw-r--r-- | exception_lists/copyright | 1 | ||||
| -rw-r--r-- | exception_lists/cstyle | 2 | ||||
| -rw-r--r-- | exception_lists/wscheck | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 2d1d784da5..90b48545bc 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -537,6 +537,7 @@ usr/src/cmd/bhyve/pci_passthru.c usr/src/cmd/bhyve/pci_uart.c usr/src/cmd/bhyve/pci_virtio_block.c usr/src/cmd/bhyve/pci_virtio_console.c +usr/src/cmd/bhyve/pci_virtio_input.c usr/src/cmd/bhyve/pci_virtio_net.c usr/src/cmd/bhyve/pci_virtio_rnd.c usr/src/cmd/bhyve/pci_virtio_scsi.c diff --git a/exception_lists/cstyle b/exception_lists/cstyle index 11f2d96e74..5d2b11b18f 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -1360,6 +1360,7 @@ usr/src/cmd/bhyve/block_if.[ch] usr/src/cmd/bhyve/bootrom.[ch] usr/src/cmd/bhyve/config.[ch] usr/src/cmd/bhyve/console.[ch] +usr/src/cmd/bhyve/console.[ch] usr/src/cmd/bhyve/consport.c usr/src/cmd/bhyve/dbgport.[ch] usr/src/cmd/bhyve/debug.h @@ -1392,6 +1393,7 @@ usr/src/cmd/bhyve/pci_uart.c usr/src/cmd/bhyve/pci_virtio_9p.c usr/src/cmd/bhyve/pci_virtio_block.c usr/src/cmd/bhyve/pci_virtio_console.c +usr/src/cmd/bhyve/pci_virtio_input.c usr/src/cmd/bhyve/pci_virtio_net.c usr/src/cmd/bhyve/pci_virtio_rnd.c usr/src/cmd/bhyve/pci_virtio_scsi.c diff --git a/exception_lists/wscheck b/exception_lists/wscheck index 5cb998b2d4..f6903f7358 100644 --- a/exception_lists/wscheck +++ b/exception_lists/wscheck @@ -108,6 +108,7 @@ 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/os-tests/tests/definit/init.data usr/src/test/util-tests/tests/dis/i386/*.out usr/src/test/libc-tests/tests/qsort/*.c usr/src/tools/smatch/src/* @@ -160,6 +161,7 @@ usr/src/cmd/bhyve/pci_uart.c usr/src/cmd/bhyve/pci_virtio_9p.c usr/src/cmd/bhyve/pci_virtio_block.c usr/src/cmd/bhyve/pci_virtio_console.c +usr/src/cmd/bhyve/pci_virtio_input.c usr/src/cmd/bhyve/pci_virtio_net.c usr/src/cmd/bhyve/pci_virtio_rnd.c usr/src/cmd/bhyve/pci_virtio_scsi.c |