[PATCH 0/3] kheaders fixes for -rc