From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 24 Aug 2022 00:57:12 +0000 (-0700)
Subject: Merge branch 'stable-12.1.x' - with open-vm-tools 12.1.0 release.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65dd4349db32e0a3084843ee145286b5868b9503;p=thirdparty%2Fopen-vm-tools.git

Merge branch 'stable-12.1.x' - with open-vm-tools 12.1.0 release.
---

65dd4349db32e0a3084843ee145286b5868b9503
diff --cc open-vm-tools/lib/include/vm_tools_version.h
index 2f5e75b4f,2435d4bc4..c3f9a240b
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@@ -1699,11 -1706,18 +1706,25 @@@ TOOLS_VERSION_UINT_TO_COMPONENTS(const 
  #endif /* RC_INVOKED */
  #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MJR  12
  #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MNR  0
+ #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_BASE 5
+ 
+ #ifndef RC_INVOKED
+ #define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+ #endif /* RC_INVOKED */
+ #define   TOOLS_VERSION_NEXT_V_MJR  12
+ #define   TOOLS_VERSION_NEXT_V_MNR  1
+ #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_SABRE_SAW_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_SABRE_SAW_UPDATE1_V)
++#endif /* RC_INVOKED */
++#define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MJR  12
++#define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MNR  0
 +#define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_BASE 5
 +
 +#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_SABRE_SAW_UPDATE1
 +#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_SABRE_SAW_UPDATE1)
 +#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_SABRE_SAW_UPDATE1)
  
  /*
   * The extended Tools version is the current Tools version with the