From: Daniel Vetter <daniel@ffwll.ch>
To: Paul Cercueil <paul@crapouillou.net>,
Maxime Ripard <mripard@kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
od@zcrc.me, Dave Airlie <airlied@linux.ie>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sam Ravnborg <sam@ravnborg.org>, Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCH] Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached"
Date: Tue, 6 Oct 2020 00:31:10 +0200 [thread overview]
Message-ID: <CAKMK7uEB7xHgnSpnT=Hd3Cw2+uwkimF=4uQuw3NOYz1DsnMY7g@mail.gmail.com> (raw)
In-Reply-To: <B3HQHQ.7DOFKW9A9TEX1@crapouillou.net>
On Mon, Oct 5, 2020 at 4:47 PM Paul Cercueil <paul@crapouillou.net> wrote:
>
> Hi,
>
> Le lun. 5 oct. 2020 à 16:05, Daniel Vetter <daniel@ffwll.ch> a écrit :
> > On Mon, Oct 05, 2020 at 11:01:50PM +1100, Stephen Rothwell wrote:
> >> Hi Paul,
> >>
> >> On Sun, 04 Oct 2020 22:11:23 +0200 Paul Cercueil
> >> <paul@crapouillou.net> wrote:
> >> >
> >> > Pushed to drm-misc-next with the changelog fix, thanks.
> >> >
> >> > Stephen:
> >> > Now it should build fine again. Could you remove the BROKEN flag?
> >>
> >> Thanks for letting me know, but the fix has not appeared in any drm
> >> tree included in linux-next yet ...
> >>
> >> If it doesn't show up by the time I will merge the drm tree
> >> tomorrow, I
> >> will apply this revert patch myself (instead of the patch marking
> >> the
> >> driver BROKEN).
> >
> > Yeah it should have been pushed to drm-misc-next-fixes per
> >
> > https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#where-do-i-apply-my-patch
> >
> > Paul, can you pls git cherry-pick -x this over to drm-misc-next-fixes?
>
> I had a few commits on top of it in drm-misc-next, so the revert
> doesn't apply cleanly in drm-misc-next-fixes... I can revert it there,
> but then we'd have a different revert commit in drm-misc-next and
> drm-misc-next-next.
>
> Sorry for the mess. What should I do?
Hm not sure why, but the reply I thought I've typed didn't seem to
have gone out.
Cherry pick up, fix up conflict and then fix up the conflict when
rebuilding drm-tip. Please tell drm-misc maintainers, they probably
want to do a backmerge once the drm-next merge window pull is merged
in Linus tree.
If we don't fix this up then the drm-next pull goes nowhere.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2020-10-05 22:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 3:54 linux-next: build failure after merge of the drm tree Stephen Rothwell
2020-09-28 6:04 ` Christoph Hellwig
2020-09-28 6:08 ` Dave Airlie
2020-09-28 6:14 ` Christoph Hellwig
2020-09-28 10:15 ` Paul Cercueil
2020-09-28 11:34 ` Christoph Hellwig
2020-09-28 11:46 ` Paul Cercueil
2020-09-28 12:10 ` Christoph Hellwig
2020-09-28 13:31 ` Paul Cercueil
2020-09-30 9:02 ` Christoph Hellwig
2020-09-30 13:33 ` Paul Cercueil
2020-09-30 16:11 ` Christoph Hellwig
2020-09-30 16:39 ` Paul Cercueil
2020-09-30 16:40 ` Christoph Hellwig
2020-09-30 16:45 ` Paul Cercueil
2020-09-30 16:52 ` Christoph Hellwig
2020-09-30 17:16 ` [PATCH 1/3] drm: Add and export function drm_gem_cma_create_noalloc Paul Cercueil
2020-10-01 8:51 ` Daniel Vetter
2020-09-30 17:16 ` [PATCH 2/3] drm/ingenic: Update code to mmap GEM buffers cached Paul Cercueil
2020-10-01 5:32 ` Christoph Hellwig
2020-09-30 17:16 ` [PATCH 3/3] drm/ingenic: Alloc cached GEM buffers with dma_alloc_noncoherent Paul Cercueil
2020-10-01 5:35 ` Christoph Hellwig
2020-10-04 14:17 ` [PATCH] Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached" Paul Cercueil
2020-10-04 19:59 ` Sam Ravnborg
2020-10-04 20:11 ` Paul Cercueil
2020-10-05 12:01 ` Stephen Rothwell
2020-10-05 14:05 ` Daniel Vetter
2020-10-05 14:47 ` Paul Cercueil
2020-10-05 17:38 ` Daniel Vetter
2020-10-05 22:31 ` Daniel Vetter [this message]
2020-10-06 4:30 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKMK7uEB7xHgnSpnT=Hd3Cw2+uwkimF=4uQuw3NOYz1DsnMY7g@mail.gmail.com' \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=od@zcrc.me \
--cc=paul@crapouillou.net \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).