Merge pull request #3373 from shenki/kernel-5.4.7

Kernel 5.4.7