From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Tue, 2 Jun 2020 21:59:52 +0200 Subject: [Buildroot] [git commit] Merge branch 'next' Message-ID: <20200602200123.4EFCF7FD63@busybox.osuosl.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net commit: https://git.buildroot.net/buildroot/commit/?id=a6569f2b3dd8b774683fdc0f7df3fcfde0b31f64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Patch is too large, so refusing to show it Patch is too large, so refusing to show it