Messages in this thread | | | Date | Wed, 4 Jan 2012 14:52:31 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the s5p tree |
| |
On Wed, Dec 28, 2011 at 04:00:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/arm/mach-exynos/cpu.c between commit f983575aa90c ("ARM: EXYNOS: > Enable conversion of GIC dt irq specifier to linux virq") from the s5p > tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to a regular > subsystem") from the driver-core tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks fine, thanks.
greg k-h
| |