From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 16 Oct 2020 23:54:13 +0000 (-0700)
Subject: Merge branch 'stable-11.2.x'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39ca508e05df57c940d393553851bc744ceb4010;p=thirdparty%2Fopen-vm-tools.git

Merge branch 'stable-11.2.x'
---

39ca508e05df57c940d393553851bc744ceb4010
diff --cc open-vm-tools/lib/include/vm_tools_version.h
index e973c0dbc,bfb0e9fc7..f6a2dade5
--- a/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
+ 
+ #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
+ 
 -#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_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