linux-kernel - linux-next: manual merge of the moduleh 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>] [day] [month] [year] [list]

Date:	Thu, 13 Oct 2011 17:25:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the moduleh tree with the s5p tree

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
arch/arm/plat-s3c24xx/devs.c, arch/arm/plat-s5p/dev-ehci.c,
arch/arm/plat-s5p/dev-onenand.c, arch/arm/plat-samsung/dev-adc.c,
arch/arm/plat-samsung/dev-asocdma.c, arch/arm/plat-samsung/dev-ide.c,
arch/arm/plat-samsung/dev-nand.c, arch/arm/plat-samsung/dev-pwm.c,
arch/arm/plat-samsung/dev-rtc.c, arch/arm/plat-samsung/dev-ts.c,
arch/arm/plat-samsung/dev-usb.c and arch/arm/plat-samsung/dev-wdt.c
between commits from the s5p tree and commits 8d7f68e196ec ("arm: fix
implicit use of asm/sizes.h in plat-s5p/plat-samsung") and 1c28ea1c50da
("arm: Add export.h to ARM specific files as required") from the moduleh
tree.

The s5p tree commits effectively removed these files, so I did that.
Hopefully the fixups from the moduleh tree are no longer required or
covered by other changes.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped