Merge branch 'stable-11.2.x'

diff --cc open-vm-tools/ChangeLog
Simple merge

diff --cc open-vm-tools/lib/include/vm_tools_version.h
index e973c0dbc0e0300e8ff7be785450a04a25949304,bfb0e9fc7c0e5e8b27f938f84edc708ab54f63fd..f6a2dade5e68c2df1e84f4a3da462f2a8dc11f54
--- 1/open-vm-tools/lib/include/vm_tools_version.h
--- 2/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@@ -1609,10 -1630,24 +1630,38 @@@ TOOLS_VERSION_UINT_TO_COMPONENTS(const 
  #define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_MJR  11
  #define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_MNR  1
  #define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_BASE 5
 -#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
 -#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
 -#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
+ 
+ #ifndef RC_INVOKED
+ #define   TOOLS_VERSION_BALLPEENHAMMER_PATCH2 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_BALLPEENHAMMER_PATCH2_V)
+ #endif /* RC_INVOKED */
+ #define   TOOLS_VERSION_BALLPEENHAMMER_PATCH2_V_MJR  11
+ #define   TOOLS_VERSION_BALLPEENHAMMER_PATCH2_V_MNR  1
+ #define   TOOLS_VERSION_BALLPEENHAMMER_PATCH2_V_BASE 6
+ 
+ #ifndef RC_INVOKED
+ #define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+ #endif /* RC_INVOKED */
+ #define   TOOLS_VERSION_NEXT_V_MJR  11
+ #define   TOOLS_VERSION_NEXT_V_MNR  2
+ #define   TOOLS_VERSION_NEXT_V_BASE 0
+ 
++#ifndef RC_INVOKED
++#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V)
++#endif /* RC_INVOKED */
++#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V_MJR  11
++#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V_MNR  1
++#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V_BASE 1
++
++#ifndef RC_INVOKED
++#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V)
++#endif /* RC_INVOKED */
++#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_MJR  11
++#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_MNR  1
++#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_BASE 5
 +
 +#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_BALLPEENHAMMER_UPDATE1
 +#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_BALLPEENHAMMER_UPDATE1)
 +#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_BALLPEENHAMMER_UPDATE1)
  
  /*
   * The extended Tools version is the current Tools version with the