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/lib/Makefile | |
| 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/lib/Makefile')
| -rw-r--r-- | usr/src/lib/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 71c231c7b1..052a9ccbd2 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -24,8 +24,8 @@ # Copyright (c) 2012 by Delphix. All rights reserved. # Copyright 2020 Joyent, Inc. # Copyright (c) 2013 Gary Mills -# Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright (c) 2015 Gary Mills +# Copyright 2022 Garrett D'Amore # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2018 Nexenta Systems, Inc. # Copyright (c) 2016, Chris Fraire <cfraire@me.com>. @@ -258,7 +258,6 @@ SUBDIRS += \ mpapi \ mpss \ nametoaddr \ - ncad_addr \ nsswitch \ pam_modules \ passwdutil \ |