[PULL] mxsfb fixes

Daniel Vetter daniel at ffwll.ch
Sun Feb 26 20:41:38 UTC 2017


On Tue, Feb 21, 2017 at 10:38:20AM +0200, Jani Nikula wrote:
> On Mon, 20 Feb 2017, Marek Vasut <marex at denx.de> wrote:
> > On 02/20/2017 10:05 AM, Dave Airlie wrote:
> >> On 20 Feb. 2017 18:29, "Marek Vasut" <marex at denx.de> wrote:
> >> 
> >> On 02/20/2017 03:56 AM, Dave Airlie wrote:
> >>> On 19 February 2017 at 08:25, Marek Vasut <marex at denx.de> wrote:
> >>>> On 02/17/2017 09:34 PM, Dave Airlie wrote:
> >>>>> On 17 February 2017 at 18:00, Marek Vasut <marex at denx.de> wrote:
> >>>>>> On 02/17/2017 03:41 AM, Dave Airlie wrote:
> >>>>>>> On 16 February 2017 at 08:16, Marek Vasut <marex at denx.de> wrote:
> >>>>>>>> Hi,
> >>>>>>>>
> >>>>>>>> I collected the MXSFB fixes, based on top of airlied/drm-fixes:
> >>>>>>>
> >>>>>>> At this stage I'd rather not give these to Linus, can you rebase them
> >> onto
> >>>>>>> drm-next, and resend, feel free to add stable cc's.
> >>>>>>>
> >>>>>>> Fixes like this should really be getting to me sooner than rc8.
> >>>>>>
> >>>>>> I know, sorry about that. I was totally overloaded in the past weeks.
> >>>>>> What about getting them to rc1, any chance for that ?
> >>>>>
> >>>>> Yes if you can rebase them onto drm-next.
> >>>>
> >>>> Ha, got it. Try the following:
> >>>>
> >>>> The following changes since commit 9ca70356a9260403c1bda40d942935
> >> e55d00c11c:
> >>>>
> >>>>   Revert "drm: Resurrect atomic rmfb code, v3" (2017-02-17 12:39:04
> >> +1000)
> >>>>
> >>>> are available in the git repository at:
> >>>>
> >>>>   git://git.kernel.org/pub/scm/linux/kernel/git/marex/linux-2.6.git
> >>>> c72a2ec8208b40683fbd2970684ffbf3a8c7d17e
> >>>
> >>> Nearly, put please use a tag :-)
> >> 
> >> I'm sure you can pull this batch without a tag ;-)
> >> 
> >> 
> >> No, I really need tags preferably signed.
> >> 
> >> Otherwise the merge is all ugly.
> >> 
> >> 
> >> What do you have in mind for the next PR
> >> 
> >> 
> >> Not sure I follow.
> >
> > What do you need to get these five fixes applied, ideally without much
> > further annoyance to either of us. Ideally point me to some docs.
> 
> Tag the head of the branch you want pulled. Push the tag to the repo you
> want Dave to pull from. Generate the pull request using the tag instead
> of branch.
> 
> Something along the lines of:
> 
> $ git tag $tag $remote/$branch
> $ git push $remote $tag
> $ git request-pull $upstream $url $tag
> 
> Replace $vars with what you have. Use git tag -s option to do a signed
> tag.

Or just come over to the evil side, aka drm-misc, where we have all this
stuff scripted.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list