[nvidia-340xx-kmod/f31: 8/8] Merge branch 'master' into f31