[PATCH OLK-6.6 0/6] merge mainline patches into OLK-6.6