From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] gpio: samsung: Skip registration if pinctrl driver is present on Exynos4x12
Date: Mon, 12 Nov 2012 14:03:05 +0900 [thread overview]
Message-ID: <004b01cdc093$00424140$00c6c3c0$%kim@samsung.com> (raw)
In-Reply-To: <CACRpkdZGu2VfP-EzAOxK3947x6Pd78bh=TWDK98iXwkJx2WiTQ@mail.gmail.com>
Linus Walleij wrote:
>
> >
> > 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.
>
Thanks ;-)
> So please bring the samsung branch into you tree and fix
> everything up there.
>
I did.
> 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.
>
OK, I see.
Thanks again.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2012-11-12 5:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-24 14:37 [PATCH 0/4] pinctrl: samsung: Add support for Exynos4x12 SoCs Tomasz Figa
2012-10-24 14:37 ` [PATCH 1/4] ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on Exynos4x12 Tomasz Figa
2012-10-24 14:37 ` [PATCH 2/4] gpio: samsung: Skip registration if pinctrl driver is present " Tomasz Figa
2012-10-28 19:11 ` Linus Walleij
2012-11-07 4:41 ` Kukjin Kim
2012-11-08 21:12 ` Linus Walleij
2012-11-09 10:09 ` Kukjin Kim
2012-11-11 18:35 ` Linus Walleij
2012-11-12 5:03 ` Kukjin Kim [this message]
2012-10-24 14:37 ` [PATCH 3/4] pinctrl: samsung: Add support for Exynos4x12 Tomasz Figa
2012-10-28 19:12 ` Linus Walleij
2012-10-29 0:30 ` Kyungmin Park
2012-10-29 10:28 ` Tomasz Figa
2012-10-29 11:27 ` Kukjin Kim
2012-10-30 9:29 ` Linus Walleij
2012-10-24 14:37 ` [PATCH 4/4] ARM: dts: exynos4x12: Add nodes for pin controllers Tomasz Figa
2012-10-28 19:13 ` Linus Walleij
2012-10-30 2:58 ` [PATCH 0/4] pinctrl: samsung: Add support for Exynos4x12 SoCs Thomas Abraham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='004b01cdc093$00424140$00c6c3c0$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox