From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: xfs <linux-xfs@vger.kernel.org>
Subject: [XFS SUMMIT] Ugh, Rebasing Sucks!
Date: Wed, 27 May 2020 11:48:58 -0700 [thread overview]
Message-ID: <20200527184858.GM8230@magnolia> (raw)
Hi everyone,
Many of you have complained (both publicly and privately) about the
heavy cost of rebasing your development trees, particularly when you're
getting close to sending a series out for review. I get it, there have
been a lot of large refactoring patchsets coming in the past few kernel
cycles, and this has caused a lot of treewide churn. I don't mind
cleanups of things that have been weird and wonky about XFS for years,
but, frankly, rebasing is soul-grinding.
To that end, I propose reducing the frequency of (my own) for-next
pushes to reduce how often people feel compelled to rebase when they're
trying to get a series ready for review.
Specifically, I would like to make an informal for-next push schedule as
follows:
1 Between -rc1 and -rc4, I'll collect critical bug fixes for the
merge window that just closed. These should be small changes, so
I'll put them out incrementally with the goal of landing everything
in -rc4, and they shouldn't cause major disruptions for anyone else
working on a big patchset. This is more or less what I've been doing
up till now -- if it's been on the list for > 24h and someone's
reviewed it, I'll put it in for-next for wider testing.
2 A day or two after -rc4 drops. This push is targeted for the next
merge window. Coming three weeks after -rc1, I hope this will give
everyone enough time for a round of rebase, review, and debugging of
large changesets after -rc1. IOWs, the majority of patchsets should
be ready to go in before we get halfway to the next merge window.
3 Another push a day or two after -rc6 drops. This will hopefully give
everyone a second chance to land patchsets that were nearly ready but
didn't quite make it for -rc4; or other cleanups that would have
interfered with the first round. Once this is out, we're more or
less finished with the big patchsets.
4 Perhaps another big push a day or two after -rc8 drops? I'm not keen
on doing this. It's not often that the kernel goes beyond -rc6 and I
find it really stressful when the -rc's drag on but people keep
sending large new patchsets. Talk about stumbling around in the
dark...
5 Obviously, I wouldn't hold back on critical bug fixes to things that
are broken in for-next, since the goal is to promote testing, not
hinder it.
Hopefully this will cut down on the "arrrgh I was almost ready to send
this but then for-next jumped and nggghghghg" feelings. :/
Thoughts? Flames?
--D
next reply other threads:[~2020-05-27 18:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 18:48 Darrick J. Wong [this message]
2020-05-28 0:03 ` [XFS SUMMIT] Ugh, Rebasing Sucks! Dave Chinner
2020-05-28 2:44 ` Darrick J. Wong
2020-05-28 12:57 ` Brian Foster
2020-05-28 22:39 ` Dave Chinner
2020-06-03 16:52 ` Darrick J. Wong
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=20200527184858.GM8230@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.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