On Thu, Oct 15, 2015 at 10:59:32AM +0200, Arnd Bergmann wrote: > The patch looks good, should we do something to prevent that from > becoming a problem when Linus pulls our branches? > > This commit is at the bottom of my asm-generic git tree, so Lee could merge > that one commit into his tree and fix up the merge correctly. > > However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c > has the same problem, so maybe it's better to add a temporary file > with the old name containing "#include <linux/io-64-nonatomic-lo-hi.h>", > which I will remove in the following merge window or as a follow-up. I guess we really need that. Do you want to do a quick fixup or should I send a patch? -- 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
