CC jean @ suse On Mon, Sep 1, 2014 at 2:28 PM, Mark Brown <broonie@xxxxxxxxxx> wrote: > Today's linux-next merge of the jdelvare-hwmon tree got a conflict with Linus' > tree which appeared to be due to the hwmon quilt series I got from Stephen being > based on v3.14-rc3 and subsequent changes from mainline interacting badly with > it. In addition I'm not able to check the original series since linux-fr.org does > not resolve for me. Same here. The domain exists, and seems to have been updated yesterday, possibly breaking it? > I'm really confused by what's going on here so I skipped the tree for today. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html