On Thu, Aug 24, 2017 at 1:28 AM, Timur Tabi [off-list ref] wrote:

On 08/23/2017 03:32 AM, Linus Walleij wrote:

quoted

It's right there on the "devel" branch from the GPIO git tree.

https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/log/?h=devel

The devel branch is missing this commit:

https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/commit/?id=83cf5faeba37fede8a6274d07f646d1cd1b25d35

Yes I have separate git trees for GPIO and pin control even.

which I need to avoid a merge conflict.  I'm going to submit a new version
of my patches, but they won't apply on top of 'devel' unless you pull in
that commit from linux-pinctrl.  Or you could copy that my gpiolib commit to
linux-pinctrl.

I don't see how you can have a merge conflict between this
patch that only affects gpiolib.c and something in the pin
control tree?

The merge window is imminent, so if it is not extremely urgent
I would opt to wait until after.

Yours,
Linus Walleij