A few conflicts had to be resolved: - Version number and hash for mesa3d-headers/mesa3d - Patches added in qemu, and the qemu version number - The gnuconfig README.buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>