diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-12 12:20:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-12 12:20:38 +0000 |
| commit | 7f81972ee25d8b65417a4f0b42124ba6e48616ac (patch) | |
| tree | 663d39c04c8740abe5a8179df2431930a52488c4 /usr/src/lib/Makefile | |
| parent | 8c6284f26f84d01dcbb0f93a15e9cf0da38c36de (diff) | |
| parent | 868e1ac07011f1f9626a73a411c31ebbdd462e3d (diff) | |
| download | illumos-joyent-7f81972ee25d8b65417a4f0b42124ba6e48616ac.tar.gz | |
[illumos-gate merge]
commit 868e1ac07011f1f9626a73a411c31ebbdd462e3d
12554 want sdev plugin framework (fix header issue)
commit b237158d576c3f39f35d97c4dd214c07273ddde4
12674 want mac rx barrier function
commit b939b187ee16d21b506005807c652e2c7bdfe243
12645 vds: smatch and NULL pointer errors
commit f8927fa6636832af96f657f29571bdbd213c6247
12554 want sdev plugin framework
commit 725953abcc30bcf6f15d7b8a313ab0749275d95f
12610 rmcadm: NULL pointer errors
commit cb453c7ae4b42ac7a2d7ce155181572a96d69b33
12650 ds: smatch and NULL pointer errors
commit 29368e865707707ba77989693d34358ebfa08757
12644 vdc: NULL pointer errors
commit 59b05390e07c3b0e69288f9a732dc5b90d464721
12539 mdb: NULL pointer errors
commit 8124b8119d8ab7f80f1bd8b094cd96356f531b54
12597 want libutempter
commit c8907381b10259bed3a871a2881c0f3b7287ab3c
12705 remove __builtin_alloca() declaration from string.h
Conflicts:
usr/src/uts/common/sys/mac_impl.h
usr/src/uts/common/sys/Makefile
Diffstat (limited to 'usr/src/lib/Makefile')
| -rw-r--r-- | usr/src/lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index c928fc8118..9fd28c40f6 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -239,6 +239,7 @@ SUBDIRS += \ libtsnet \ libtsol \ libumem \ + libutempter \ libuuid \ libuutil \ libvnd \ @@ -493,6 +494,7 @@ HDRSUBDIRS= \ libtsnet \ libtsol \ libumem \ + libutempter \ libuutil \ libvnd \ libvolmgt \ |