On Fri, Dec 14, 2018 at 11:13:25AM +0100, Roland Hieber wrote: > Hmm. It still applies here cleanly on next. Do you want it on master > instead? I don't mind having it in next, and if you applied this series > on master instead, the conflicts with next will probably be the other > way around for the next release. Right, I found the conflicting patch and applied ontop of it. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox