Squashed kernel update 2