[PATCH OLK-5.10 0/3] merge mainline patch into OLK-5.10