On Fri, Nov 9, 2012 at 11:09 AM, Kukjin Kim [off-list ref] wrote:

quoted

On Wed, Nov 7, 2012 at 5:41 AM, Kukjin Kim [off-list ref] wrote:

quoted

A commit 1b6056d6 ("pinctrl: samsung: Include bank-specific eint offset

in

quoted

bank struct") which is in your pinctrl tree (samsung branch) changed
macro(EXYNOS_PIN_BANK_EINTG) to add offset. Eventually, this series(due

to

quoted

3rd patch, pinctrl: samsung: Add support for Exynos4x12) breaks

compilation

quoted

without the commit. So if you don't have a plan to rebase samsung branch

of

quoted

your pinctrl tree, I'd like to merge it in my tree. Is it ok to you?

Sure tell me when you've merged it and I'll drop commit 1b6056d6
from my tree.

Thanks :-)

(- some guys in Cc...)

But having a problem, the 'it' means the commit 1b6056d6? If so, I couldn't
cherry-pick only that because of dependency with other commits 40ba622 and
3a232ba.

$ git cherry-pick -s 40ba622
[next/dt-exynos4x12 3b1977c] pinctrl: samsung: Assing pin numbers
dynamically
 Author: Tomasz Figa [off-list ref]
 3 files changed, 62 insertions(+), 54 deletions(-)

$ git cherry-pick -s 3a232ba
[next/dt-exynos4x12 7fa08a4] pinctrl: samsung: Remove static pin
enumerations
 Author: Tomasz Figa [off-list ref]
 1 files changed, 96 insertions(+), 215 deletions(-)
 rewrite drivers/pinctrl/pinctrl-exynos.h (66%)

$ git cherry-pick -s 1b6056d
[next/dt-exynos4x12 86010aa] pinctrl: samsung: Include bank-specific eint
offset in bank struct
 Author: Tomasz Figa [off-list ref]
 3 files changed, 30 insertions(+), 29 deletions(-)

I could cherry-pick clearly with 2 more commits.

Can you drop above 3 commits in your tree? If many conflicts happens during
rebasing, how about that I merge your pinctrl/samsung branch into Samsung
tree?...

Why not :-)

I have removed the samsung branch from my for-next to avoid
clashes.

So please bring the samsung branch into you tree and fix
everything up there.

Axel Lin has sent some tree-wide cleanups but let's hope they don't
hit samsung so much, or they will need to be postponed/dropped.

Yours,
Linus Walleij