[GIT PULL] SOCFPGA DTS updates for 3.16, take 2

Olof Johansson olof at lixom.net
Mon May 26 11:20:00 PDT 2014


On Thu, May 22, 2014 at 09:26:24AM -0500, Dinh Nguyen wrote:
> 
> On 5/22/14 12:15 AM, Olof Johansson wrote:
> > On Sun, May 18, 2014 at 10:47:21PM -0500, dinguyen at altera.com wrote:
> >> Hi Arnd, Kevin and Olof,
> >>
> >> Please consider pulling in this patch for 3.16. This patch adds the DTS
> >> entries for the GPIOs on the SOCFPGA platform.
> >>
> >> Olof had a question regarding how the GPIO node needed 2-layer approach.
> >>
> >> http://thread.gmane.org/gmane.linux.kernel/1671569/focus=1702208
> >>
> >> I hope that Alan Tull was able to answer Olof's question.
> >>
> >> Thanks,
> >>
> >> The following changes since commit 2bfac3a551978c4953f659e1bd18d58c3c249f64:
> >>
> >>   Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt (2014-05-16 16:07:37 -0700)
> > You can't base your branch on top of our next/dt. You should have based
> > this on top of your previous branch, and not pulled down our contents
> > for it.
> Ah thanks, and sorry about that. So should my pull request start from
> v3.15-rc1(was the
> last rc in my branch) or the last commit that you pulled in?

Going through old unread email, and didn't see an answer (nor did I answer
myself). You can base it on the last previous commit, that's fine.

> >
> > Please send a new pull request, or let me know if you prefer me to just
> > cherry-pick over the one patch -- your choice.
> Let me send you a new pull request as there is another that just came in.

Ok, np. Arnd might already have taken care of them, I haven't gotten that far
in this folder yet. :)


-Olof



More information about the linux-arm-kernel mailing list