On Mon, 2 Nov 2015 17:30:23 +1100Stephen Rothwell <sfr@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 willneed to do himself when he hits the conflict too.-- Steve