Merge branch 'next'
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>
Tue, 2 Jun 2020 19:59:52 +0000 (21:59 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Tue, 2 Jun 2020 19:59:52 +0000 (21:59 +0200)
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>
1  2 
DEVELOPERS
linux/linux.mk
package/Config.in
package/binutils/binutils.mk
package/glibc/glibc.mk
package/mesa3d/mesa3d.mk
package/python-markdown2/python-markdown2.mk
package/uacme/uacme.mk

diff --cc DEVELOPERS
index efb97c739cfc4e75110fc9adbf5c01b45019ff72,04811b6288f039317017c62db53a4889ad549e4f..e3ac8aa06a0dcf5de46829eea3cca5e59c6f72a4
@@@ -2361,9 -2396,16 +2361,13 @@@ F:    package/libscrypt
  N:    Stephan Hoffmann <sho@relinux.de>
  F:    package/cache-calibrator/
  F:    package/gtest/
 -F:    package/mtdev/
 -F:    package/mtdev2tuio/
 -
 -N:    Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net>
  F:    package/libhttpserver/
 +F:    package/mtdev/
  
+ N:    Stephane Viau <stephane.viau@oss.nxp.com>
+ F:    board/freescale/imx8mnevk/
+ F:    configs/freescale_imx8mnevk_defconfig
  N:    Steve Calfee <stevecalfee@gmail.com>
  F:    package/python-pymysql/
  F:    package/python-pyratemp/
diff --cc linux/linux.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge