linux-kernel - linux-next: manual merge of the s5p tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111228100741.5a6a6f36055d2ea06c1d4014@canb.auug.org.au>
Date:	Wed, 28 Dec 2011 10:07:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Rajeshwari Shinde <rajeshwari.s@...sung.com>,
	Padmavathi Venna <padma.v@...sung.com>
Subject: linux-next: manual merge of the s5p tree with the arm tree

Hi Kukjin,

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.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
  

Content of type "application/pgp-signature" skipped