diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-07-12 11:21:05 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-07-12 11:21:05 -0400 |
| commit | 5d2a8042164bbd53c76fba15bc19f5f37dcaf3ad (patch) | |
| tree | aa6bca3618882783829475b59f351c18995b3e55 /usr/src/cmd/mdb/intel/amd64 | |
| parent | 2392c818d2f71eb00ab8baf8acc9129b4b48b4cd (diff) | |
| parent | d5ba932774e3e5d63ba25284cae7bb0e8a0b5d1d (diff) | |
| download | illumos-joyent-5d2a8042164bbd53c76fba15bc19f5f37dcaf3ad.tar.gz | |
[illumos-gate merge]
commit d5ba932774e3e5d63ba25284cae7bb0e8a0b5d1d
14808 removal of nca (14768) missed the headers
commit df6bbf77738915d14e10da5a075ed017edd1f8be
14688 nvme blkdev attach/detach trips assertion in ndi_devi_unconfig_one()
commit 20e6de55ab1d426790ba858431f38b11e499c967
14585 loader: should preserve order of console device list
commit db6ea8e69c35f1dac85a7e12505787c1212108b2
14594 psrinfo(1M) may fail to emit socket type
commit 15f90b02bdacbf0ae47fa105944f15b6596f9748
14768 retire nca
commit 174513368dec739adb93c76e5d47aed84797d1ad
14739 smbtorture disconnect after bad credit grant
commit 2126a14a5539b804448c27ae4eee033b7aacfa50
7524 setting msgid=0 in log.conf makes all messages seem to come from "unix"
Conflicts:
usr/src/uts/common/io/ksocket/ksocket.c
usr/src/uts/intel/Makefile.intel
Diffstat (limited to 'usr/src/cmd/mdb/intel/amd64')
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/nca/Makefile | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/nca/Makefile b/usr/src/cmd/mdb/intel/amd64/nca/Makefile deleted file mode 100644 index 4c7e428c18..0000000000 --- a/usr/src/cmd/mdb/intel/amd64/nca/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" - -MODULE = nca.so -MDBTGT = kvm - -MODSRCS = nca.c - -include ../../../../Makefile.cmd -include ../../../../Makefile.cmd.64 -include ../../Makefile.amd64 -include ../../../Makefile.module |