Merge changes I5595abaa,I2b9563e1 into main

* changes:
  bpf: KVER_5_9 -> KVER_5_10
  bpf: KVER_5_8 -> KVER_5_10