Merge remote branch 'origin/master' into kernel-git
    
    Squash rawhide branch into the kernel-git branch so it
    can be pulled back into the master branch. Merge is made
    by
     % git merge -s ours --no-commit origin/master
    and then merged back directly into origin/master.