[VirtualBox/f25] (2 commits) ...Remove patch already in upstream and cleanup spec