From: Kukjin Kim <kgene.kim@samsung.com>
To: Tomasz Figa <t.figa@samsung.com>
Cc: linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linaro-kernel@lists.linaro.org, Mark Brown <broonie@linaro.org>,
Kukjin Kim <kgene.kim@samsung.com>, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>
Subject: Re: [PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c
Date: Fri, 21 Mar 2014 03:08:21 +0900 [thread overview]
Message-ID: <532B2E95.50608@samsung.com> (raw)
In-Reply-To: <1395162964-5916-4-git-send-email-t.figa@samsung.com>
On 03/19/14 02:16, Tomasz Figa wrote:
> Recent Samsung header clean-up series did heavy reorganization of
> various Samsung-specific headers, unfortunately causing a conflict with
> Samsung PM consolidation series part 2 - multiplatform) and resulting
> with a merge error that caused a build failure, due to a missing header
> being included.
>
> This patch fixes this by removing incorrect header inclusion.
>
> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> ---
> arch/arm/plat-samsung/pm-debug.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c
> index 602998b..88bb4cf 100644
> --- a/arch/arm/plat-samsung/pm-debug.c
> +++ b/arch/arm/plat-samsung/pm-debug.c
> @@ -20,7 +20,6 @@
>
> #include<plat/cpu.h>
> #include<plat/pm-common.h>
> -#include<plat/regs-serial.h>
>
> #ifdef CONFIG_SAMSUNG_ATAGS
> #include<mach/pm-core.h>
OK, applied into s2r-pm-samsung-2 branch.
Thanks,
Kukjin
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c
Date: Fri, 21 Mar 2014 03:08:21 +0900 [thread overview]
Message-ID: <532B2E95.50608@samsung.com> (raw)
In-Reply-To: <1395162964-5916-4-git-send-email-t.figa@samsung.com>
On 03/19/14 02:16, Tomasz Figa wrote:
> Recent Samsung header clean-up series did heavy reorganization of
> various Samsung-specific headers, unfortunately causing a conflict with
> Samsung PM consolidation series part 2 - multiplatform) and resulting
> with a merge error that caused a build failure, due to a missing header
> being included.
>
> This patch fixes this by removing incorrect header inclusion.
>
> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> ---
> arch/arm/plat-samsung/pm-debug.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c
> index 602998b..88bb4cf 100644
> --- a/arch/arm/plat-samsung/pm-debug.c
> +++ b/arch/arm/plat-samsung/pm-debug.c
> @@ -20,7 +20,6 @@
>
> #include<plat/cpu.h>
> #include<plat/pm-common.h>
> -#include<plat/regs-serial.h>
>
> #ifdef CONFIG_SAMSUNG_ATAGS
> #include<mach/pm-core.h>
OK, applied into s2r-pm-samsung-2 branch.
Thanks,
Kukjin
next prev parent reply other threads:[~2014-03-20 18:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 17:15 [PATCH v2 1/6] serial: s3c: Fix build of header without serial_core.h preinclusion Tomasz Figa
2014-03-18 17:15 ` Tomasz Figa
2014-03-18 17:16 ` [PATCH v2 2/6] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion Tomasz Figa
2014-03-18 17:16 ` Tomasz Figa
2014-03-18 17:16 ` [PATCH v2 3/6] ARM: EXYNOS: Fix compilation error in cpuidle.c Tomasz Figa
2014-03-18 17:16 ` Tomasz Figa
2014-03-20 18:01 ` Kukjin Kim
2014-03-20 18:01 ` Kukjin Kim
2014-03-18 17:16 ` [PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c Tomasz Figa
2014-03-18 17:16 ` Tomasz Figa
2014-03-20 18:08 ` Kukjin Kim [this message]
2014-03-20 18:08 ` Kukjin Kim
2014-03-18 17:16 ` [PATCH v2 5/6] ARM: s3c64xx: Fix incorrect selection of PM-related symbols Tomasz Figa
2014-03-18 17:16 ` Tomasz Figa
2014-03-20 18:20 ` Kukjin Kim
2014-03-20 18:20 ` Kukjin Kim
2014-03-18 17:16 ` [PATCH v2 6/6] ARM: s5p64x0: Explicitly include linux/serial_s3c.h in mach/pm-core.h Tomasz Figa
2014-03-18 17:16 ` Tomasz Figa
2014-03-20 18:35 ` Kukjin Kim
2014-03-20 18:35 ` Kukjin Kim
2014-03-20 17:52 ` [PATCH v2 1/6] serial: s3c: Fix build of header without serial_core.h preinclusion Kukjin Kim
2014-03-20 17:52 ` Kukjin Kim
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=532B2E95.50608@samsung.com \
--to=kgene.kim@samsung.com \
--cc=arnd@arndb.de \
--cc=broonie@linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
--cc=t.figa@samsung.com \
/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.