Merge kmod::alias from upstream