On 12/13/2015 3:27 AM, Linus Walleij wrote:
On Wed, Dec 9, 2015 at 6:06 PM, Ray Jui <rjui@xxxxxxxxxxxx> wrote:
The change itself looks fine to me. But I thought the previous patchset from
Pramod changes the file name, all the function names and macros from
"cygnus" to "iproc" and have been merged by you?
Shouldn't this patch be developed on top of that? Or am I missing something?
Merge conflicts is a fact of life. I am merging this change to the GPIO
tree and the other stuff is merged to the pinctrl tree.
That said I think that git copes with this kind of stuff. And if it doesn't,
I will maybe merge the trees into one for this merge window, just to make
things easier.
Yours,
Linus Walleij
Okay. As it is this change looks good to me!
Acked-by: Ray Jui <rjui@xxxxxxxxxxxx>
Thanks!
Ray
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
