On Tue, Feb 21, 2017 at 10:05 AM, Linus Walleij <[email protected]> wrote:
Damned I missed this too: > - We merge an immutable branch from the GPIO tree that hits a whole slew > of sites in drivers/gpio, and obviously these changes will also be visible > in the GPIO pull request. - The above leads to a conflict with the staging tree greybus GPIO driver in drivers/staging/greybus/gpio.c where a checkpatch fix was clashing with the changes. Stephen has a resolution in the next tree. This is more of a minor, ordinary merge conflict (than the other crap in the GPIO tree I try to solve right now) so should be OK for you to handle I hope. Yours, Linus Walleij
