archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <>
To: Matthew Wilcox <>
Cc: linux-mm <>,
	linux-fsdevel <>,
	Linux Kernel Mailing List <>
Subject: Re: [GIT PULL] XArray for 4.19
Date: Wed, 22 Aug 2018 11:41:11 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Wed, Aug 22, 2018 at 11:23 AM Matthew Wilcox <> wrote:
> Dan added an entirely new function here:
> which needed to be converted to XArray.  So I should have pulled in his
> branch as a merge somewhere close to the end of my series, then done a
> fresh patch on top of that to convert it?

No, it doesn't matter if you rebase on top of a broken branch, or you
merge it in. Either way, it's broken and I can't merge your end

You should simply NOT CARE about other branches. Particularly not
other branches that might not even get merged in the first place!

You should care about *YOUR* work.  You should make sure *your* work
is rock solid, and that it is based on a rock solid base. Not some
random shifting quick-sand of somebody elses development branch.

Sure, then linux-next will give a merge conflict, but at that point
YOU DO NOT REBASE OR MERGE. You tell linux-next how to merge it, and
mention it to me in the pull request.

Because at that point, I have the *choice* of merging just one of the
branches or both.  Or I can merge them in either order, and test them

See how that is fundamentally different from you tying the two
branches together and handing me a fait accompli?

Yes, yes, sometimes you have to tie branches together because one
branch fundamentally depends on the features the other branch offers.
But that should be avoided like a plague if at all possible.

And it damn well isn't an issue for something like xarray, which has a
life entirely independently of libnvdimm (and vice versa), and the
conflict was just random happenstance, not some "my changes
fundamentally rely on the new features you provide".


  reply	other threads:[~2018-08-22 18:41 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-13 16:13 [GIT PULL] XArray for 4.19 Matthew Wilcox
2018-08-22  2:09 ` Linus Torvalds
2018-08-22  2:50   ` Matthew Wilcox
2018-08-22  3:00     ` Linus Torvalds
2018-08-22 18:23       ` Matthew Wilcox
2018-08-22 18:41         ` Linus Torvalds [this message]
2018-08-24  5:25   ` Stephen Rothwell
2018-08-22 17:40 ` Christopher Lameter
2018-08-22 17:43   ` Linus Torvalds
2018-08-22 18:23     ` Dan Williams
2018-08-24 13:21   ` Vlastimil Babka
2018-08-24 14:12     ` Christopher Lameter

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* 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).