Messages in this thread | | | Date | Tue, 27 Mar 2012 15:26:15 -0700 | Subject | Re: [GIT PULL 06/09] ARM: board specific updates | From | Olof Johansson <> |
| |
Linus,
On Sat, Mar 24, 2012 at 3:02 PM, Arnd Bergmann <arnd@arndb.de> wrote: > These changes are all specific to one board only. We're trying to keep > the number of board files low, but generally board level updates are > ok on platforms that are working on moving towards DT based probing, > which will eventually lead to removing them. > > The board-ams-delta.c board file gets a conflict between the removal of > ams_delta_config and the addition of a lot of other data. The Kconfig > file has two changes in the same line, and in exynos, the power domain > cleanup conflicts with the addition of the image sensor device. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > The following changes since commit "abd43e4 Merge branch 'next/boards' > into for-next", leading up to commit " b9e1122 Merge tag 'asoc-3.4' > of git://git.kernel.org/pub/scm", are available in > > git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/boards
The topmost commit on the branch had a mismerge causing compilation failures on OMAP4 (arch/arm/mach-omap2/board-oamp4panda.c).
I've amended in the fix with the top merge commit to fix it, updated the tag and pushed out the new branch and tag to the repo. The diffstat should be identical, but the signature is obviously from me, not Arnd.
-Olof
| |