On Monday 19 March 2012, Tomi Valkeinen wrote: > Here are the changes for OMAP DSS driver for v3.4. > > There's an issue with the dss driver that appears on arm-soc/for-next > branch, which I'm still solving > (http://marc.info/?l=linux-omap&m=133214966902577&w=2). I hope to get > fix for that ready and merged for -rc1, but I'm not sure if I can make > it in time, so I wanted to sent this pull request already. > > Arnd, as discussed before, you can also merge this branch to solve the > conflicts between arm-soc and omapdss trees. > > Note that this is the first pull request I've sent with a branch that I > have not been rebasing, so please check that the branch looks sane. Thanks Tomi, I've looked at the specific conflicts again, and it seems that the only conflicting commit in arm-soc is 2e3ee9f45b "ARM: OMAP1: Move most of plat/io.h into local iomap.h". I'm planning to send that one very early, as soon as Russell has his first set up patches merged, so I don't actually have to resolve the conflict here unless Florian is also there early. Florian, if I end up being faster than you, feel free to pull the omap/cleanup branch from git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git if you want to get a conflict resolution using the minimum set of patches from upstream. Alternatively, pulling "cleanup" from git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap should give you the same. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
