Re: [GIT PULL] dlm updates for 6.0

From: Linus Torvalds
Date: Mon Aug 01 2022 - 12:17:56 EST

On Mon, Aug 1, 2022 at 8:56 AM David Teigland <teigland@xxxxxxxxxx> wrote:
> At risk of compounding your trouble, I could have added that you can use
> the original merge and have me send the fixup.

Well, I only had something like 4 other merges on top, none of them
*that* complicated.

And I hadn't pushed out, so I just redid them.

I did notice your "v2" pull request fairly quickly, because I try to
do my pulls (when I have lots of them, like at the beginning of the
merge window) in some kind of "order of areas", so I was doing
filesystem and vfs stuff, and your v2 ended up showing up in that
bunch too, and I hadn't done too much.

I doubt I would have needed help with the conflicts, but I decided to
not even look at them, because even with them resolved it would just
have been ugly to have that pointless duplication from the rebase when
I could just start from scratch again.

But again: please don't rebase stuff you have already exposed to
others. It causes real issues. This was just one example of it.

And if you *do* have to rebase for a real technical reason ("Oh, that
was a disaster, it absolutely *must* be fixed"), please let involved
people know asap.

And a version number change is not a "huge disaster, must rebase".