Messages in this thread | | | From | Olof Johansson <> | Subject | [GIT PULL 0/7] ARM: SoC material for 3.16, first batch | Date | Mon, 2 Jun 2014 14:04:03 -0700 |
| |
Hi Linus,
Here's the first batch of arm-soc material for 3.16. There are a couple more branches but they depend on shared contents with Russell's tree, so we'll send that up after he has had his material merged.
Again, like last merge window, the bulk of contents is in device tree updates. We've even had a couple of SoCs go in that didn't require enough code changes that I noticed it when I was sifting through the material writing up the tags, which is good news. It's not a primary goal that we can do quite this much only with DT updates, but it's still good to see.
There are a few conflicts, some due to add/add from our different branches, and a few of them because we've had new changes not always properly based on cleanups and not caught it in time. Nothing that should be too messy to fix up.
We've been holding back Samsung from adding new SoC support until they sorted out their multiplatform support, which they now have done. We're very happy to be able to build an Exynos-enabled kernel together with the other platforms now (Tegra, i.MX, OMAP, and all the others). This also means that their slight backlog of SoC support is now picked up so we've got a bunch of clock drivers and other things for their 3250 and 5410/5420/5800 series of chips.
I've documented the conflicts in each email, and I've pushed a "resolved-for-3.16" branch with our proposed resolutions.
| |