mpokang cherry-pick kang kernel