diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-22 11:27:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-22 11:27:20 +0000 |
| commit | dabc60f5b9afa61baa5a6a19a03802ad59a5462e (patch) | |
| tree | 2fb2a476f888078066eef01d4748f41d3668c145 /manifest | |
| parent | 1f6ef55bbc34d163d8228af4d5c128e1e5a5c4db (diff) | |
| parent | 865498e43471404cd766389d4b8e045ed6ef3be1 (diff) | |
| download | illumos-joyent-dabc60f5b9afa61baa5a6a19a03802ad59a5462e.tar.gz | |
[illumos-gate merge]
commit 865498e43471404cd766389d4b8e045ed6ef3be1
commit 6205b5c44bad9044e168b06aef439c2e7cdc8a89
12508 ndi_devi_alloc() and friends could take const char * names
commit e98dc02a871a9cd0498c8862434b16aa85e772d3
12482 Have /usr/bin/awk point to /usr/bin/nawk
commit 9e717e77bf4b9b5ad279c38a2311c076468e85f5
12496 bge mac address initialization is wrong
12497 bge ape locking left always disabled after 7513
12498 bge ring interrupt masking logic is broken
commit a2876d03ca2556102e024ae4a50bb4db8fe562b0
12450 Add support for BCM57765 family devices to bge
commit 85f496fabdffd32673f6be280a3caa103f7d58a5
12520 Enable IPv6 tso in igb, ixgbe, and i40e
commit 0418219cf21334a9c6712bbb2cec543b2ee4f989
12552 increase get_max_pages
commit ee73640b6a4781aa745f3868c448d1b9dd1c29f6
12469 mlxcx: errors in package metadata
Conflicts:
usr/src/man/man1/nawk.1 [deleted upstream]
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -11905,7 +11905,7 @@ f usr/share/man/man1/at.1 0444 root bin f usr/share/man/man1/atq.1 0444 root bin f usr/share/man/man1/atrm.1 0444 root bin f usr/share/man/man1/auths.1 0444 root bin -s usr/share/man/man1/awk.1=nawk.1 +f usr/share/man/man1/awk.1 0444 root bin f usr/share/man/man1/banner.1 0444 root bin f usr/share/man/man1/basename.1 0444 root bin s usr/share/man/man1/batch.1=at.1 @@ -12122,7 +12122,7 @@ f usr/share/man/man1/mpss.so.1.1 0444 root bin f usr/share/man/man1/msgfmt.1 0444 root bin f usr/share/man/man1/mt.1 0444 root bin f usr/share/man/man1/mv.1 0444 root bin -f usr/share/man/man1/nawk.1 0444 root bin +s usr/share/man/man1/nawk.1=awk.1 f usr/share/man/man1/nc.1 0444 root bin s usr/share/man/man1/neqn.1=eqn.1 f usr/share/man/man1/newform.1 0444 root bin |