[kernel] backport two changes from kernel.org: