From: Jason Gunthorpe <jgg@mellanox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Airlie <airlied@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Jerome Glisse <jglisse@redhat.com>,
Thomas Hellstrom <thellstrom@vmware.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: DRM pull for v5.3-rc1
Date: Mon, 15 Jul 2019 19:17:08 +0000 [thread overview]
Message-ID: <20190715191702.GD5043@mellanox.com> (raw)
In-Reply-To: <CAHk-=wgEimwxXiDUdp9eSGZn4j6n8g-4KhdEG0kPVgKFQeAXgw@mail.gmail.com>
On Mon, Jul 15, 2019 at 11:16:11AM -0700, Linus Torvalds wrote:
> [ Ugh, I have three different threads about the drm pull because of
> the subject / html confusion. So now I'm replying in separate threads
> and I'm hoping the people involved have better threading than gmail
> does ;/ ]
>
> On Mon, Jul 15, 2019 at 5:29 AM Jason Gunthorpe <jgg@mellanox.com> wrote:
> >
> > The 'hmm' tree is something I ran to try and help workflow issues like
> > this, as it could be merged to DRM as a topic branch - maybe consider
> > this flow in future?
> >
> > Linus, do you have any advice on how best to handle sharing mm
> > patches?
>
> I don't have a lot of advice except for "very very carefully".
>
> I think the hmm tree worked really well this merge window, at least
> from my standpoint.
>
> But it is of course possible that my happiness about the hmm tree is a
> complete fluke and came about because pretty much all the patches were
> removing oddities and cleaning things up, and they weren't adding new
> odd things (or if they were, you hid it better ;^).
lol
Actually I think it was a lot of effort from many people to monitor
and stay on top of conflicts, and there was certainly a deliberate
effort to bring many people together.
About the only thing I could concretely suggest for working with -mm
is if there was some way the -mm quilt patches could participate in
'git merge' resolution at your level.
I only say this because the lowest point was when merging CH's series
to hmm.git caused Andrew to have to do a lot of work rebasing DanW's
series during rc7. Arguably that should have been my work preparing a
conflict resolution instruction, not his doing rebases.
.. and if we needed to revise hmm.git Dan's series would have been at
more risk. It kind of still is as I haven't seen him Ack Andrew's
rebase yet?
Thanks,
Jason
next prev parent reply other threads:[~2019-07-15 19:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAPM=9tzJQ+26n_Df1eBPG1A=tXf4xNuVEjbG3aZj-aqYQ9nnAg@mail.gmail.com>
2019-07-15 7:08 ` drm pull for v5.3-rc1 Dave Airlie
2019-07-15 12:16 ` Daniel Vetter
2019-07-15 17:37 ` Linus Torvalds
2019-07-15 18:00 ` Linus Torvalds
2019-07-15 18:29 ` Dave Airlie
2019-07-15 18:37 ` Linus Torvalds
2019-07-15 19:35 ` Thomas Hellström (VMware)
2019-07-15 20:07 ` Linus Torvalds
2019-07-15 22:17 ` Linus Torvalds
2019-08-06 7:38 ` Christoph Hellwig
2019-08-06 7:40 ` Christoph Hellwig
2019-08-06 18:50 ` Linus Torvalds
2019-08-06 19:09 ` Matthew Wilcox
2019-08-07 6:40 ` Christoph Hellwig
2019-08-07 14:15 ` Matthew Wilcox
2019-08-07 14:30 ` Steven Price
2019-08-07 14:56 ` Matthew Wilcox
2019-08-07 15:32 ` Steven Price
2019-08-07 15:55 ` Matthew Wilcox
2019-08-07 19:16 ` Linus Torvalds
2019-08-07 6:38 ` Christoph Hellwig
2019-07-15 18:27 ` Dave Airlie
[not found] ` <CAPM=9tx+CEkzmLZ-93GZmde9xzJ_rw3PJZxFu_pjZJc7KM5f-w@mail.gmail.com>
2019-07-15 12:29 ` DRM " Jason Gunthorpe
2019-07-15 13:21 ` Stephen Rothwell
2019-07-15 14:19 ` Daniel Vetter
2019-07-15 15:04 ` Jason Gunthorpe
2019-07-15 17:53 ` Daniel Vetter
2019-07-15 17:57 ` Jason Gunthorpe
2019-07-15 18:06 ` Daniel Vetter
2019-07-15 18:16 ` Linus Torvalds
2019-07-15 19:00 ` Linus Torvalds
2019-07-15 19:17 ` Jason Gunthorpe [this message]
2019-07-15 19:31 ` Linus Torvalds
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=20190715191702.GD5043@mellanox.com \
--to=jgg@mellanox.com \
--cc=airlied@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thellstrom@vmware.com \
--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).