All of lore.kernel.org
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Kukjin Kim <kgene.kim@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
	Thomas Abraham <thomas.abraham@linaro.org>,
	Olof Johansson <olof@lixom.net>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Sat, 09 Feb 2013 14:20:14 +0000	[thread overview]
Message-ID: <20130209142014.208ED3E30EC@localhost> (raw)
In-Reply-To: <20130131014801.09c81e1826a2fb234de85550@canb.auug.org.au>

On Thu, 31 Jan 2013 01:48:01 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kukjin,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> drivers/gpio/gpio-samsung.c between commits f69254328793 ("ARM: dts: Fix
> compatible value of pinctrl module on EXYNOS5440") and b533c8685b16
> ("ARM: dts: fix compatible value for exynos pinctrl") from the arm-soc
> tree and commit bda7f6d4e198 ("gpio: samsung: skip gpiolib registration
> if pinctrl support is enabled for exynos5250") from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen.

g.

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/gpio/gpio-samsung.c
> index b2016ed,0d46db6..0000000
> --- a/drivers/gpio/gpio-samsung.c
> +++ b/drivers/gpio/gpio-samsung.c
> @@@ -3023,9 -3023,9 +3022,10 @@@ static __init int samsung_gpiolib_init(
>   	*/
>   	struct device_node *pctrl_np;
>   	static const struct of_device_id exynos_pinctrl_ids[] = {
>  -		{ .compatible = "samsung,pinctrl-exynos4210", },
>  -		{ .compatible = "samsung,pinctrl-exynos4x12", },
>  -		{ .compatible = "samsung,pinctrl-exynos5250", },
>  +		{ .compatible = "samsung,exynos4210-pinctrl", },
>  +		{ .compatible = "samsung,exynos4x12-pinctrl", },
> ++		{ .compatible = "samsung,exynos5250-pinctrl", },
>  +		{ .compatible = "samsung,exynos5440-pinctrl", },
>   	};
>   	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
>   		if (pctrl_np && of_device_is_available(pctrl_np))
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.

WARNING: multiple messages have this Message-ID (diff)
From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Sat, 09 Feb 2013 14:20:14 +0000	[thread overview]
Message-ID: <20130209142014.208ED3E30EC@localhost> (raw)
In-Reply-To: <20130131014801.09c81e1826a2fb234de85550@canb.auug.org.au>

On Thu, 31 Jan 2013 01:48:01 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kukjin,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> drivers/gpio/gpio-samsung.c between commits f69254328793 ("ARM: dts: Fix
> compatible value of pinctrl module on EXYNOS5440") and b533c8685b16
> ("ARM: dts: fix compatible value for exynos pinctrl") from the arm-soc
> tree and commit bda7f6d4e198 ("gpio: samsung: skip gpiolib registration
> if pinctrl support is enabled for exynos5250") from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen.

g.

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au
> 
> diff --cc drivers/gpio/gpio-samsung.c
> index b2016ed,0d46db6..0000000
> --- a/drivers/gpio/gpio-samsung.c
> +++ b/drivers/gpio/gpio-samsung.c
> @@@ -3023,9 -3023,9 +3022,10 @@@ static __init int samsung_gpiolib_init(
>   	*/
>   	struct device_node *pctrl_np;
>   	static const struct of_device_id exynos_pinctrl_ids[] = {
>  -		{ .compatible = "samsung,pinctrl-exynos4210", },
>  -		{ .compatible = "samsung,pinctrl-exynos4x12", },
>  -		{ .compatible = "samsung,pinctrl-exynos5250", },
>  +		{ .compatible = "samsung,exynos4210-pinctrl", },
>  +		{ .compatible = "samsung,exynos4x12-pinctrl", },
> ++		{ .compatible = "samsung,exynos5250-pinctrl", },
>  +		{ .compatible = "samsung,exynos5440-pinctrl", },
>   	};
>   	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
>   		if (pctrl_np && of_device_is_available(pctrl_np))
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.

  reply	other threads:[~2013-02-09 14:20 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-30 14:48 linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-02-09 14:20 ` Grant Likely [this message]
2013-02-09 14:20   ` Grant Likely
  -- strict thread matches above, loose matches on Subject: below --
2014-07-21  1:13 Stephen Rothwell
2014-07-21  1:13 ` Stephen Rothwell
2014-07-21  1:13 ` Stephen Rothwell
2014-07-17  2:06 Stephen Rothwell
2014-07-17  2:06 ` Stephen Rothwell
2014-07-17  2:06 ` Stephen Rothwell
2014-07-17  2:01 Stephen Rothwell
2014-07-17  2:01 ` Stephen Rothwell
2014-07-17  2:01 ` Stephen Rothwell
2014-07-17  1:54 Stephen Rothwell
2014-07-17  1:54 ` Stephen Rothwell
2014-07-17  1:54 ` Stephen Rothwell
2014-05-26  0:17 Stephen Rothwell
2014-05-26  0:17 ` Stephen Rothwell
2014-05-26  0:17 ` Stephen Rothwell
2014-05-26  0:37 ` Stephen Rothwell
2014-05-26  0:37   ` Stephen Rothwell
2014-05-26  0:37   ` Stephen Rothwell
2014-03-23 23:30 Stephen Rothwell
2014-03-23 23:30 ` Stephen Rothwell
2014-03-23 23:30 ` Stephen Rothwell
2013-04-05  5:02 Stephen Rothwell
2013-04-05  5:02 ` Stephen Rothwell
2013-04-05  5:02 ` Stephen Rothwell
2013-04-05  6:49 ` Kukjin Kim
2013-04-05  6:49   ` Kukjin Kim
2013-02-13  7:39 Stephen Rothwell
2013-02-13  7:39 ` Stephen Rothwell
2013-02-13  7:39 ` Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-18  3:28 Stephen Rothwell
2013-01-18  3:28 ` Stephen Rothwell
2013-01-18  3:28 ` Stephen Rothwell
2013-01-18  3:24 Stephen Rothwell
2013-01-18  3:24 ` Stephen Rothwell
2013-01-18  3:24 ` Stephen Rothwell
2013-01-18  3:21 Stephen Rothwell
2013-01-18  3:21 ` Stephen Rothwell
2013-01-18  3:21 ` Stephen Rothwell
2013-01-11  4:32 Stephen Rothwell
2013-01-11  4:32 ` Stephen Rothwell
2013-01-11  4:32 ` Stephen Rothwell
2013-01-17  3:53 ` Stephen Rothwell
2013-01-17  3:53   ` Stephen Rothwell
2013-01-17  3:53   ` Stephen Rothwell
2013-01-17  4:06   ` Kukjin Kim
2013-01-17  4:06     ` Kukjin Kim
2013-01-17  4:10   ` Kukjin Kim
2013-01-17  4:10     ` Kukjin Kim
2013-01-17  5:02   ` Kukjin Kim
2013-01-17  5:02     ` Kukjin Kim
2013-01-17  5:13   ` Kukjin Kim
2013-01-17  5:13     ` Kukjin Kim
2013-01-17  5:59     ` Stephen Rothwell
2013-01-17  5:59       ` Stephen Rothwell
2013-01-11  4:18 Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2012-11-26 11:19 ` Stephen Rothwell
2012-11-26 11:19 ` Stephen Rothwell
2012-11-26 11:15 Stephen Rothwell
2012-11-26 11:15 ` Stephen Rothwell
2012-11-26 11:15 ` Stephen Rothwell
2012-09-24 10:52 Stephen Rothwell
2012-09-24 10:52 ` Stephen Rothwell
2012-09-24 10:52 ` Stephen Rothwell

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=20130209142014.208ED3E30EC@localhost \
    --to=grant.likely@secretlab.ca \
    --cc=arnd@arndb.de \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=thomas.abraham@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.