On Fri, Mar 24, 2017 at 11:10:03AM -0500, Rob Herring wrote: > On Wed, Mar 22, 2017 at 07:05:55AM -0600, Sam Povilus wrote: > > On Wed, Mar 22, 2017 at 09:42:40AM +0100, Wolfram Sang wrote: > > > > > > > .../devicetree/bindings/i2c/trivial-devices.txt | 2 -- > > > > > > This file is about to get moved one directory up: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=b7e252fcddfa573bb1ee275b53bba6cef85671d4 > > > > > > Just so you know already... > > > > > > > Thanks! I'm a bit new to this, what's the best way for me to handle > > this? Submit against Linus' tree (presumably making a merge nightmare > > for someone) or rebase my branch off robh's (and presumably risking some > > other branch's patch conflicting)? > > Send me a separate patch for just this file and I'll pick it up. > Agreed, that seems to be the best approach. Thanks, Guenter -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html