lkml.org 
[lkml]   [2012]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL 1/5] ARM: cleanups of io includes
From
On Thu, Mar 29, 2012 at 5:27 PM, Olof Johansson <olof@lixom.net> 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.

-Olof


\
 
 \ /
  Last update: 2012-03-30 02:37    [W:0.049 / U:0.312 seconds]
©2003-2014 Jasper Spaans. Advertise on this site