linux-kernel - linux-next: manual merge of the usb tree with the s5p 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: <20120514174743.de608c90ed9653d827707a7b@canb.auug.org.au>
Date:	Mon, 14 May 2012 17:47:43 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lukasz Majewski <l.majewski@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Marek Szyprowski <m.szyprowski@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the usb tree with the s5p tree

Hi Greg,

Today's linux-next merge of the usb tree got conflicts in
arch/arm/mach-exynos/mach-nuri.c  and
arch/arm/mach-exynos/mach-universal_c210.c between commits db6856e8d8ab
("ARM: EXYNOS: Add DRM core support for NURI board") and 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-exynos/mach-nuri.c
index 17cce18,2c6d701..0000000
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@@ -25,7 -25,7 +25,8 @@@
  #include <linux/mmc/host.h>
  #include <linux/fb.h>
  #include <linux/pwm_backlight.h>
+ #include <linux/platform_data/s3c-hsotg.h>
 +#include <drm/exynos_drm.h>
  
  #include <video/platform_lcd.h>
  #include <media/m5mols.h>
diff --cc arch/arm/mach-exynos/mach-universal_c210.c
index 00c1a7b,bc8bf3b..0000000
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/i2c-gpio.h>
  #include <linux/i2c/mcs.h>
  #include <linux/i2c/atmel_mxt_ts.h>
+ #include <linux/platform_data/s3c-hsotg.h>
 +#include <drm/exynos_drm.h>
  
  #include <asm/mach/arch.h>
  #include <asm/hardware/gic.h>

Content of type "application/pgp-signature" skipped