diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-07-27 17:10:56 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-07-27 17:11:06 -0400 |
| commit | f296fe3752760624e99cd00a72103976ed6b38b5 (patch) | |
| tree | 515c78f0c06d5be242e568944b78c3a6305af825 /usr/src/cmd/Makefile | |
| parent | 23cf9d8375c8b9f39f05db37ede85475b2225ddd (diff) | |
| parent | ff5d40392f371e5d7648aef49cd3ce3834e48611 (diff) | |
| download | illumos-joyent-f296fe3752760624e99cd00a72103976ed6b38b5.tar.gz | |
[illumos-gate merge]
commit ff5d40392f371e5d7648aef49cd3ce3834e48611
13816 loader: BIOS build should not use -fPIC
commit b57f5d3e6a2df8d435e606797cf3934811848343
13833 want bhyve memory reservoir
13822 bhyve memory should exert memory pressure
13834 want extensible page_resv
13821 vmmctl ioctls should have more structure
commit ed1e93792d7c9ea04a0cb44cffe34c24c135b002
13882 libipadm ipadm_if_info() is not 64bit safe
commit f3a2bc1eccb884e62be4c0b42935466b79b1342d
6161 zero-sized kmem_alloc() in zfs`spa_load_l2cache
Conflicts:
manifest
usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_main.c
usr/src/uts/common/vm/page.h
usr/src/uts/i86pc/Makefile.files
usr/src/uts/i86pc/io/vmm/vmm.c
Diffstat (limited to 'usr/src/cmd/Makefile')
| -rw-r--r-- | usr/src/cmd/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index a4bacee105..a66bec5656 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -496,6 +496,7 @@ i386_SUBDIRS= \ nvmeadm \ pptadm \ rdmsr \ + rsrvrctl \ rtc \ ucodeadm \ xhci \ |