This is an automated cherry-pick of pingcap#20874

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: qiancai

hardware-and-software-requirements.md

@@ -46,7 +46,11 @@ As an open-source distributed SQL database with high performance, TiDB can be de
     <td><ul><li>x86_64</li><li>ARM 64</li></ul></td>
   </tr>
   <tr>
+<<<<<<< HEAD
     <td>Kylin Euler V10 SP1/SP2</td>
+=======
+    <td>Kylin V10 SP1/SP2/SP3 (SP3 is supported starting from v7.5.5)</td>
+>>>>>>> 36dfd3bc59 (hardware-and-software-requirements: update Kylin Euler to Kylin (#20874))
     <td><ul><li>x86_64</li><li>ARM 64</li></ul></td>
   </tr>
   <tr>