Patch "Revert "spi: bcm-qspi: shut up warning about cfi header inclusion"" has been added to the 4.9-stable tree