On Mon, 2 Nov 2015 17:30:23 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote:
> So I guess I need that (or something similar) in linux-next until these > trees are merged. > Yeah, the fixup looks fine to me. It will be something that Linus will need to do himself when he hits the conflict too. -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
