Re: [GIT PULL 1/5] ARM: cleanups of io includes
From: Olof Johansson
Date: Thu Mar 29 2012 - 20:34:06 EST
On Thu, Mar 29, 2012 at 5:27 PM, Olof Johansson <olof@xxxxxxxxx> wrote:
> It hasn't grown any new merge conflicts
> since before as of now, so see the original pull request for those.
D'oh, I did a git remote update but didn't checkout the new head for
your tree when I verified the merge conflict situation. It does have a
couple of new trivial ones:
* arch/arm/mach-tegra/Makefile: keep reset.o, remove localtimer.o
* arch/arm/mach-vexpress/include/mach/io.h: line remove vs file remove
conflict: file is gone, but a patch in rmk's tree had removed a line
from it. It's safe to still remove the file.
+ the previous ones from original pull request:
arch/arm/Kconfig: New selects added for ARCH_S3C24X. Include both
sides of the merge.
arch/arm/mach-shmobile/smp-sh73a0.c: A readl vs readw fix collided
with the io accessor cleanup. Ditch the __io() use but keep readl.
arch/arm/mach-tegra/include/mach/debug-macro.S: include of mach/io.h
is going away, iomap.h is kept.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/