| Message ID | pull-1353978372-642963 |
|---|---|
| State | New |
| Headers | show |
On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote: > The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d: > > Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed > > for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05: > > ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800) Tony, Did you mean to base this branch on next/cleanup? We normally try to avoid having vendor branches based on our common next/* branches, since it adds dependencies that makes it hard to rebuild our branch if needed for some reason. -Olof
On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote: > The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9: > > Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed > > for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7: > > Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800) Thanks, pulled. Dependencies are getting to be a bit complex for omap stuff at this point, so I merged it into a new next/pm2 branch. It's not unlikely that we will combine next/pm, next/clock and next/pm2 into one branch before merging upstream, since there are lots of internal dependencies between those. -Olof
* Olof Johansson <olof@lixom.net> [121129 22:56]: > On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote: > > The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9: > > > > Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800) > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed > > > > for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7: > > > > Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800) > > Thanks, pulled. Dependencies are getting to be a bit complex for omap stuff at > this point, so I merged it into a new next/pm2 branch. It's not unlikely that > we will combine next/pm, next/clock and next/pm2 into one branch before merging > upstream, since there are lots of internal dependencies between those. Yes thanks, only fixes coming up for omaps until -rc1 is tagged. Regards, Tony
The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9: Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b: ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800) ---------------------------------------------------------------- Timer clean-up to get us closer to moving timer code to drivers, and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board or devicetree provided timer configuration. Note that these changes are on top of the recent timer fixes. ---------------------------------------------------------------- Igor Grinberg (2): ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER ARM: OMAP3: cm-t3517: use GPTIMER for system clock Jon Hunter (8): ARM: OMAP: Clean-up dmtimer reset code ARM: OMAP: Define omap_dm_timer_prepare function as static ARM: OMAP: Don't store timers physical address ARM: OMAP2+: Remove unnecessary local variable in timer code ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration ARM: OMAP: Add platform data header for DMTIMERs ARM: OMAP: Remove unnecessary inclusion of dmtimer.h ARM: OMAP2+: Fix compiler warning for 32k timer Tony Lindgren (1): Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3.8/timer arch/arm/mach-omap1/timer.c | 1 + arch/arm/mach-omap1/timer32k.c | 1 - arch/arm/mach-omap2/board-cm-t3517.c | 2 +- arch/arm/mach-omap2/common.h | 1 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 - arch/arm/mach-omap2/pm-debug.c | 1 - arch/arm/mach-omap2/timer.c | 167 +++++++++++++---------------- arch/arm/plat-omap/Kconfig | 6 ++ arch/arm/plat-omap/dmtimer.c | 54 ++++++---- arch/arm/plat-omap/include/plat/dmtimer.h | 80 ++++---------- drivers/staging/tidspbridge/core/ue_deh.c | 1 - include/linux/platform_data/dmtimer-omap.h | 31 ++++++ 13 files changed, 168 insertions(+), 179 deletions(-) create mode 100644 include/linux/platform_data/dmtimer-omap.h