Message ID | 20140109085251.GA30534@quad.lixom.net |
---|---|
State | New |
Headers | show |
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
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