918513 Merge branch 'users/ohering/SLE15-SP4/for-next' into SLE15-SP4

Merged and Committed by Vlastimil Babka a year ago
    Merge branch 'users/ohering/SLE15-SP4/for-next' into SLE15-SP4
    
    Pull a patch metadata fix from Olaf Hering.