Hi Linus, >Right now this does not apply to my "devel" branch, so I'd like you >to rebase on that right now. (This is what will go into v3.12). > >This is also late in the development cycle so I believe this is going to >be v3.13 material unless there are more release candidates. > >You can also hold on until after the v3.12 merge window and then >rebase it and we'll merge it as a first patch in the v3.13 development >cycle. > >What do you say?
You mean the "devel" branch in this tree, right? Please let me know if you're talking about another tree/branch. git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git I cherry-picked my commit on top of devel, and there was just a simple conflict in pinctrl-sunxi.c. It's easy enough to fix, so I'll send out v2 that's based on "devel" instead of rc6 anyway. I can just do another rebase after v3.12 merge window if needed. Thanks! Sherman -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
