Merge

3 files changed, 63 insertions, 2 deletions

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 9f5cbaa0160..436b7d74e01 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -403,6 +403,11 @@ ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
 438cc91b51330a61a790f0a0ac64816b565d25f0 jdk8u45-b15
 5a4ccc33ab26b635f91ddd424742b0009a37bcc0 jdk8u45-b31
 4597cb5171773416c4b2e1843db8592a69ff7a99 jdk8u45-b32
+5d158dedeb68fdcb58f3c66ff61d64d5d1ea47c3 jdk8u45-b33
+ebebf3d201322c5ac421a4b97ce14293c3963c2a jdk8u45-b34
+8f4dba55bb2a4a767067a89523346b54f0be9e19 jdk8u45-b35
+f85b9174094cfa8f250b115e591601602f142f76 jdk8u45-b36
+ac6b7b573c39e6a9b95c599c2ddecf1858e3fe88 jdk8u45-b37
 a1682688c9aec33c172146ce4be8d3969e7d76bb jdk8u51-b00
 e04f2ee2d03d9927d2012286a9bcbf511eb887ae jdk8u51-b01
 4dee64570ad013eb5e1cb16304f9eff558c1c5e9 jdk8u51-b02
@@ -420,6 +425,7 @@ f07a9ef02d513435e19fd70abcce2871d1c91342 jdk8u51-b12
 5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14
 54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15
 3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16
+58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31
 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
@@ -445,3 +451,13 @@ c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20
 01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u60-b22
 91e6153db0df9245c4b60197c78f72e510026b2c jdk8u60-b23
 280834e00e6267fae1ae2a86a8bd7d1fdd160cba jdk8u60-b24
+be2ddf520d263ea27a075f895d93adada6702027 jdk8u60-b25
+45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
+2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
+45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
+566b0467f9b3dc7053e3a998b1ddec2243ee09d9 jdk8u65-b01
+760c71b8c3f4e5d2c1b52bd165149621d4ac8b98 jdk8u65-b02
+159ed2ae97c93d024bc0212595a09e8cc9b08958 jdk8u65-b03
+62625c423592073a935388bf46a78a3747c6fbe3 jdk8u65-b04
+5476dd40852d9d38afa4850edb78a951e91c14dd jdk8u65-b05
+350f9114b53d85ece93ca95d6a277d0b1503f3f1 jdk8u65-b06
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index e9d5d9db9bc..dba567ca6b8 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -597,6 +597,35 @@ f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26
 6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
 8220f68a195f6eeed2f5fb6e8a303726b512e899 jdk8u40-b31
 850a290eb1088a61178d1910c500e170ef4f4386 jdk8u40-b32
+1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
+f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
+99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
+8b9ec2da541a74ac698560b6a2bc45fccb789919 hs25.40-b16
+6b93bf9ea3ea57ed0fe53cfedb2f9ab912c324e5 jdk8u40-b12
+521e269ae1daa9df1cb0835b97aa76bdf340fcb2 hs25.40-b17
+86307d47790785398d0695acc361bccaefe25f94 jdk8u40-b13
+4d5dc0d0f8799fafa1135d51d85edd4edd566501 hs25.40-b18
+b8ca8ec1daea70f7c0d519e866f9f147ec247055 jdk8u40-b14
+eb16b24e2eba9bdf04a9b377bebc2db9f713ff5e jdk8u40-b15
+3a8a0fd171c5876023112941b1c7254262f9adfc hs25.40-b19
+aa2442f89230dc46147c721812f3b3bd4c612e83 hs25.40-b20
+5ea68fb91139081304357f9b937f32c5fdfeca6d jdk8u40-b16
+6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21
+fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
+bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
+31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18
+f8fc5cbe082ce0fb0c6c1dcd39493a16ed916353 hs25.40-b23
+d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u40-b19
+c3933f52eeb33f70ee562464edddfe9f01d944fd jdk8u40-b20
+d2e9a6bec4f2eec8506eed16f7324992a85d8480 hs25.40-b24
+25ec4a67433744bbe3406e5069e7fd1876ebbf2f jdk8u40-b21
+0f0cb4eeab2d871274f4ffdcd6017d2fdfa89238 hs25.40-b25
+0ee548a1cda08c884eccd563e2d5fdb6ee769b5a jdk8u40-b22
+0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23
+fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
+698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25
+f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26
+6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
 b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02
@@ -615,6 +644,11 @@ efbf340fc7f56e49735111c23cef030413146409 jdk8u45-b13
 a5ba7c9a0b916ea088aaac5d40e17b4675c2b026 jdk8u45-b15
 894b92a02c533bcd1203c4beb5b6ec067b63466e jdk8u45-b31
 1428b6aa09c4e17202b801530c3c4993c7ce8e5b jdk8u45-b32
+9b2bf0d8a9a0fa7fe7486eb29454eae4b08f3d82 jdk8u45-b33
+dc3c47fc6218003b23338b978b3f13a6d7976b41 jdk8u45-b34
+3cb364e46590add7cb42ec8b6565a3c62adf824d jdk8u45-b35
+48b09bb741171b0069000ac1cf5407ef2357d3d1 jdk8u45-b36
+3c2ea5da6afd55a524e25dc56747940324befda2 jdk8u45-b37
 b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00
 c1de2652a48c1d4a0c96707acc73db3cd317df2a jdk8u51-b01
 8f03c2f5fc170da5fca2cf65734941efb619feca jdk8u51-b02
@@ -632,6 +666,7 @@ ce81c4487dd1e9f89d4570a8cd25e349f6bae00d jdk8u51-b09
 a4eea4bee2d4fdb05f1a8358d70ec6adb1135526 jdk8u51-b14
 9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15
 3639e38bd73f5efa8ce092f0a745bb0c90759575 jdk8u51-b16
+20bad8c6c7b406c3603b4e22b15cd990840a9d62 jdk8u51-b31
 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00
 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00
 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01
@@ -681,3 +716,13 @@ ff8fdeb2fb6d6f3348597339c53412f8f6202c3f hs25.60-b22
 0e4094950cd312c8f95c7f37336606323fe049fe jdk8u60-b23
 d89ceecf1bad55e1aee2932b8895d60fc64c15db hs25.60-b23
 fb157d537278cda4150740e27bb57cd8694e15bf jdk8u60-b24
+6b4ea38c01bd9cc86d0aa8926f4855ff6ee365ee jdk8u60-b25
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
+9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
+b6815d853c359be92e61f422ea5018af1f81d0c7 jdk8u65-b01
+488661b9cbdaeb24be14873f3bd39a945575692a jdk8u65-b02
+ea47136e6ea4253c0bf238fb61760f98a8d01ebc jdk8u65-b03
+2a03fd592fe60fd113c1c89e431ebaa6857c4998 jdk8u65-b04
+aa915217a00c4b8ce0e82d1b23fa1df8a9e4cc70 jdk8u65-b05
+3070e116da4cfebc2ceb0df8f40faeefd38a6d4a jdk8u65-b06
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index ac4d1bf018a..08d1e6b58c0 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=60
-HS_BUILD_NUMBER=23
+HS_MINOR_VER=65
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8