diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-09 11:36:25 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-09 11:36:25 +0000 |
| commit | 7206b5f287f083164b3183f08c59d976a894284f (patch) | |
| tree | 19a0fd8fb67e78f68c90097192b4d9533a9f710c /usr/src/boot/Makefile.version | |
| parent | 7847a0def2f92ff8670c7d008f9caae2b2585752 (diff) | |
| parent | d0e58ef5d66890a3cd67c9c6eb8c823f9865a70f (diff) | |
| download | illumos-joyent-7206b5f287f083164b3183f08c59d976a894284f.tar.gz | |
[illumos-gate merge]
commit d0e58ef5d66890a3cd67c9c6eb8c823f9865a70f
10896 Want support for AMD Zen CPC events
commit c18e9bc303e04175d63c5c51206b2ce6f6efe6a4
10895 Update cpcgen tools and data for Cascade Lake
commit 8095452365aae38329650734a6846e8886ac4d48
10912 loader: validate sectorsize argument in disk_open()
commit c232df923d558b3a28acd1911d7f0ee5952f7bbe
10911 dd: add input flag fullblock
commit 083aabdd02fbac3a467d358cbd26fbb44174e385
10905 loader.efi: uninitialized symbol 'ret'
commit 4188fb37741cc73b35fdd065a2c20fc9054d7f49
10860 mdb: update mbr to print vbr and add vtoc command
commit c28006dedbb1a63ed6cd12fc2ec1c2be15b425d1
10838 loader: bcache.c cstyle cleanup
Conflicts:
usr/src/uts/intel/sys/x86_archext.h
usr/src/uts/i86pc/os/cpuid.c
usr/src/data/Makefile
Diffstat (limited to 'usr/src/boot/Makefile.version')
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index fcf8fcba05..04e89bb2ad 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2019.04.15.1 +BOOT_VERSION = $(LOADER_VERSION)-2019.05.05.1 |