- Use upstream patch for blkid fat detection, avoids div-by-zero when encountering some BSD partitions (#398281)
- Fix blkid fat probe when there is a real MBR (#290951)