sync with latest kernel changes

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>