kernel: sync patchset with upstream