From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Airlie <airlied@gmail.com>,
dri-devel <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [git pull] drm for 5.13-rc1
Date: Wed, 28 Apr 2021 20:14:31 +0200 [thread overview]
Message-ID: <CAKMK7uHn_qFrfK9Dkd41NdXd-VHFsbH4gdnX3+J=0GQ_H0C0Mw@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wh22MOMM5Paw-dHVvkp6W+UKx8mv_TNJ1TY9iaAMS1rLQ@mail.gmail.com>
On Wed, Apr 28, 2021 at 7:07 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie <airlied@gmail.com> wrote:
> >
> > There aren't a massive amount of conflicts, only with vmwgfx when I
> > did a test merge into your master yesterday, I think you should be
> > able to handle them yourself, but let me know if you want me to push a
> > merged tree somewhere (or if I missed something).
>
> The conflict was easy enough to resolve, but was unusual in that my
> tree had vmwgfx fixes that weren't in the development tree (ie that
> commit 2ef4fb92363c: "drm/vmwgfx: Make sure bo's are unpinned before
> putting them back").
>
> Usually when I merge stuff, I can see that the fixes that were pushed
> to my tree are also in the development branch. Not so this time.
Maybe we're overdoing it a bit, but we're trying to not backmerge all
the time for no reason at all. Only when someone requests it due to
more more patches for the dev tree that need both stuff from -fixes
and -next. Also keeps you entertained during the merge window :-) Plus
I think it keeps us more honest with really just pushing minimal
bugfixes to -fixes to keep conflicts reasonable and all that.
But if it's a bit overdone I guess we can backmerge a bit more often.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-04-28 18:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 3:31 [git pull] drm for 5.13-rc1 Dave Airlie
2021-04-28 17:07 ` Linus Torvalds
2021-04-28 18:14 ` Daniel Vetter [this message]
2021-04-28 18:16 ` Linus Torvalds
2021-04-28 17:33 ` pr-tracker-bot
2021-04-28 22:21 ` Linus Torvalds
2021-04-29 0:14 ` Mikita Lipski
2021-04-29 2:09 ` Alex Deucher
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='CAKMK7uHn_qFrfK9Dkd41NdXd-VHFsbH4gdnX3+J=0GQ_H0C0Mw@mail.gmail.com' \
--to=daniel.vetter@ffwll.ch \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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).