On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai <tiwai@xxxxxxx> wrote: > On Mon, 03 Jul 2017 04:55:24 +0200, > Stephen Rothwell wrote: >> >> Hi all, >> >> [cc-ing the sound tree maintainer] > > Thanks. > >> With the merge window opening, just a reminder that this conflict >> still exists. > > Rob, do you have an immutable branch to drag the affecting commit so > that I can merge & resolve in my side? Yes, use this branch: git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/property-move Rob -- 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
