linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] ARM: SoC fixes for 3.13
@ 2014-01-09  8:52 Olof Johansson
  2014-01-10  8:56 ` Linus Torvalds
  0 siblings, 1 reply; 3+ messages in thread
From: Olof Johansson @ 2014-01-09  8:52 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Linus,

The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:

  Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus

for you to fetch changes up to 7c06abcb16e1a03270f70725d0c62e8cf818cf48:

  Merge tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes (2014-01-02 11:00:49 -0800)

----------------------------------------------------------------

ARM: SoC fixes for 3.13-rc

Hopefully the last set of arm-soc fixes for 3.13, or at least only a
few stray patches after this.

There are a few fixes for Renesas platforms to fixup DMA masks (this
started causing errors once the DMA API added checks for valid masks in
3.13). Two more dealing with resources for MMC and PWM setup.

There's also a few TI/OMAP/DRA fixes for smaller stuff and a fix for
compilation failures on a PXA platform.

----------------------------------------------------------------
Ben Dooks (1):
      ARM: shmobile: r8a7790: fix shdi resource sizes

Kuninori Morimoto (1):
      ARM: shmobile: bockw: fixup DMA mask

Laurent Pinchart (4):
      ARM: shmobile: armadillo: Add PWM backlight power supply
      ARM: shmobile: armadillo: Fix coherent DMA mask
      ARM: shmobile: kzm9g: Fix coherent DMA mask
      ARM: shmobile: mackerel: Fix coherent DMA mask

Linus Walleij (1):
      ARM: pxa: fix USB gadget driver compilation regression

Olof Johansson (3):
      Merge tag 'renesas-fixes2-for-v3.13' of git://git.kernel.org/.../horms/renesas into fixes
      Merge tag 'omap-for-v3.13/intc-ldp-fix' of git://git.kernel.org/.../tmlind/linux-omap into fixes
      Merge tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/.../horms/renesas into fixes

Rajendra Nayak (1):
      ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL

Suman Anna (1):
      ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data

Tony Lindgren (2):
      ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting
      Merge tag 'for-v3.13-rc/hwmod-fixes-b' of git://git.kernel.org/.../pjw/omap-pending into debug-ll-and-ldp-backlight-fix

 arch/arm/boot/dts/r8a7790.dtsi                     |  4 ++--
 arch/arm/mach-omap2/board-ldp.c                    |  7 ++++++-
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |  4 ++--
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |  6 +++---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |  2 +-
 arch/arm/mach-pxa/include/mach/lubbock.h           |  2 ++
 arch/arm/mach-shmobile/board-armadillo800eva.c     | 11 +++++++++--
 arch/arm/mach-shmobile/board-bockw.c               |  2 +-
 arch/arm/mach-shmobile/board-kzm9g.c               |  2 +-
 arch/arm/mach-shmobile/board-mackerel.c            |  4 ++--
 10 files changed, 29 insertions(+), 15 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [GIT PULL] ARM: SoC fixes for 3.13
  2014-01-09  8:52 [GIT PULL] ARM: SoC fixes for 3.13 Olof Johansson
@ 2014-01-10  8:56 ` Linus Torvalds
  2014-01-10 16:04   ` Olof Johansson
  0 siblings, 1 reply; 3+ messages in thread
From: Linus Torvalds @ 2014-01-10  8:56 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jan 9, 2014 at 4:52 PM, Olof Johansson <olof@lixom.net> wrote:
>
> ARM: SoC fixes for 3.13-rc
>
> Hopefully the last set of arm-soc fixes for 3.13, or at least only a
> few stray patches after this.
>
> There are a few fixes for Renesas platforms to fixup DMA masks (this
> started causing errors once the DMA API added checks for valid masks in
> 3.13). Two more dealing with resources for MMC and PWM setup.
>
> There's also a few TI/OMAP/DRA fixes for smaller stuff and a fix for
> compilation failures on a PXA platform.

Hmm. Most of that was all in your _previous_ pull request. When I pull
this time, I just get the few fixes for  Renesas DMA masks.

I pulled that and edited up the resulting merge message, but you
should double-check that I now have what you expected. Because your
pull request seems a bit confused about what's been going on..

           Linus

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [GIT PULL] ARM: SoC fixes for 3.13
  2014-01-10  8:56 ` Linus Torvalds
@ 2014-01-10 16:04   ` Olof Johansson
  0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2014-01-10 16:04 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Jan 10, 2014 at 12:56 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Thu, Jan 9, 2014 at 4:52 PM, Olof Johansson <olof@lixom.net> wrote:
>>
>> ARM: SoC fixes for 3.13-rc
>>
>> Hopefully the last set of arm-soc fixes for 3.13, or at least only a
>> few stray patches after this.
>>
>> There are a few fixes for Renesas platforms to fixup DMA masks (this
>> started causing errors once the DMA API added checks for valid masks in
>> 3.13). Two more dealing with resources for MMC and PWM setup.
>>
>> There's also a few TI/OMAP/DRA fixes for smaller stuff and a fix for
>> compilation failures on a PXA platform.
>
> Hmm. Most of that was all in your _previous_ pull request. When I pull
> this time, I just get the few fixes for  Renesas DMA masks.

I had a stale remote for your tree when I generated the pull request,
and I had forgotten that I sent most of it already so I didn't notice.

> I pulled that and edited up the resulting merge message, but you
> should double-check that I now have what you expected. Because your
> pull request seems a bit confused about what's been going on..

Yeah, looks good. Apologies for the confusion.


-Olof

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-01-10 16:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-09  8:52 [GIT PULL] ARM: SoC fixes for 3.13 Olof Johansson
2014-01-10  8:56 ` Linus Torvalds
2014-01-10 16:04   ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).