From: Kukjin Kim <kgene.kim@samsung.com>
To: "'Stephen Rothwell'" <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"'Russell King'" <rmk@arm.linux.org.uk>,
"'Mark Brown'" <broonie@opensource.wolfsonmicro.com>,
"'Rajeshwari Shinde'" <rajeshwari.s@samsung.com>,
"'Padmavathi Venna'" <padma.v@samsung.com>
Subject: RE: linux-next: manual merge of the s5p tree with the arm tree
Date: Wed, 28 Dec 2011 17:01:53 +0900 [thread overview]
Message-ID: <01ea01ccc536$f6584e70$e308eb50$%kim@samsung.com> (raw)
In-Reply-To: <20111228100741.5a6a6f36055d2ea06c1d4014@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi Stephen :)
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s3c64xx/Makefile between commit b024043b6d0d ("ARM: 7245/1:
> S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
> and commits 8f8a8d269bb4 ("ARM: S3C64XX: Add basic cpuidle driver"),
> a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from platform
> data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI platform
> devices to plat-samsung") and 4566c7f7612f ("ARM: S3C64XX: Modified files
> for SPI consolidation work") from the s5p tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
>
Looks good to me.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-s3c64xx/Makefile
> index f37016c,2244c42..0000000
> --- a/arch/arm/mach-s3c64xx/Makefile
> +++ b/arch/arm/mach-s3c64xx/Makefile
> @@@ -19,29 -19,29 +19,29 @@@ obj-y += common.o
> clock.
> obj-$(CONFIG_CPU_S3C6400) += s3c6400.o
> obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
>
> -obj-y += irq.o
> -obj-y += irq-eint.o
> +# PM
> +
> +obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o
> ++obj-$(CONFIG_CPU_IDLE) += cpuidle.o
>
> # DMA support
>
> obj-$(CONFIG_S3C64XX_DMA) += dma.o
>
> -# Device setup
> +# Device support
>
> -obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
> -obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
> -obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
> -obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
> -obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
> -obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
> -obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
> +obj-y += dev-uart.o
> +obj-y += dev-audio.o
> - obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
>
> -# PM
> +# Device setup
>
> -obj-$(CONFIG_PM) += pm.o
> -obj-$(CONFIG_PM) += sleep.o
> -obj-$(CONFIG_PM) += irq-pm.o
> -obj-$(CONFIG_CPU_IDLE) += cpuidle.o
> +obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
> +obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
> +obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
> +obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
> +obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
> - obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o
> +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
> ++obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
>
> # Machine support
>
next prev parent reply other threads:[~2011-12-28 8:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-27 23:07 linux-next: manual merge of the s5p tree with the arm tree Stephen Rothwell
2011-12-28 8:01 ` Kukjin Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-05 1:09 Stephen Rothwell
2012-01-05 2:34 ` Kukjin Kim
2012-01-04 2:18 Stephen Rothwell
2012-01-04 9:07 ` Russell King
2012-01-05 0:46 ` Kukjin Kim
2011-12-27 23:36 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-28 8:33 ` Kukjin Kim
2011-12-27 23:21 Stephen Rothwell
2011-12-27 23:17 Stephen Rothwell
2011-12-05 0:01 Stephen Rothwell
2011-11-22 2:05 Stephen Rothwell
2011-11-22 2:01 Stephen Rothwell
2011-10-11 2:07 Stephen Rothwell
2011-09-22 2:08 Stephen Rothwell
2011-07-20 1:35 Stephen Rothwell
2011-07-20 8:04 ` Russell King
2011-07-20 8:25 ` Stephen Rothwell
2011-07-20 10:38 ` Kukjin Kim
2011-05-23 1:58 Stephen Rothwell
2010-10-17 23:55 Stephen Rothwell
2010-10-18 1:04 ` Kukjin Kim
2010-10-17 23:50 Stephen Rothwell
2010-10-18 0:57 ` Kukjin Kim
2010-10-18 10:39 ` Kukjin Kim
2010-07-30 0:48 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='01ea01ccc536$f6584e70$e308eb50$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=padma.v@samsung.com \
--cc=rajeshwari.s@samsung.com \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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.