From: Daniel Vetter <daniel@ffwll.ch>
To: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Boris Brezillon <boris.brezillon@bootlin.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"James Qian Wang (Arm Technology China)"
<james.qian.wang@arm.com>
Subject: Re: linux-next: build failure after merge of the mali-dp tree
Date: Tue, 15 Jan 2019 13:08:36 +0100 [thread overview]
Message-ID: <20190115120836.GN10517@phenom.ffwll.local> (raw)
In-Reply-To: <20190115105102.GQ20661@e110455-lin.cambridge.arm.com>
On Tue, Jan 15, 2019 at 10:51:02AM +0000, Liviu Dudau wrote:
> On Tue, Jan 15, 2019 at 09:47:25PM +1100, Stephen Rothwell wrote:
> > Hi Liviu,
> >
> > On Tue, 15 Jan 2019 10:12:19 +0000 Liviu Dudau <Liviu.Dudau@arm.com> wrote:
> > >
> > > That looks like the right fix, thank you for that!
> >
> > Thanks for your verification.
> >
> > > I will roll your patch into my tree.
> >
> > You can only do that when your tree is merged with the drm tree (and
> > it should be part of the merge resolution).
>
> I can also rebase on top of the latest drm-next tree, that should not be
> a problem.
If you have a lot of patches already rebasing is kinda discouraged. There
might be other stuff that's conflicting and then making your entire tree
non-bisectable (maybe just on one platform that you missed in testing).
In that case just send out a pull for drm-next and include the merge
resolution in the pull request so Dave/I can double-check we did it right.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-01-15 12:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 23:46 linux-next: build failure after merge of the mali-dp tree Stephen Rothwell
2019-01-15 10:12 ` Liviu Dudau
2019-01-15 10:47 ` Stephen Rothwell
2019-01-15 10:51 ` Liviu Dudau
2019-01-15 12:08 ` Daniel Vetter [this message]
2019-01-15 12:23 ` Liviu Dudau
2019-01-15 13:37 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2019-01-14 1:21 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=20190115120836.GN10517@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=Liviu.Dudau@arm.com \
--cc=airlied@linux.ie \
--cc=boris.brezillon@bootlin.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=james.qian.wang@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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