From: Matthew Wilcox <willy@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-mm <linux-mm@kvack.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] XArray for 4.19
Date: Tue, 21 Aug 2018 19:50:40 -0700 [thread overview]
Message-ID: <20180822025040.GA12244@bombadil.infradead.org> (raw)
In-Reply-To: <CA+55aFxFjAmrFpwQmEHCthHOzgidCKnod+cNDEE+3Spu9o1s3w@mail.gmail.com>
On Tue, Aug 21, 2018 at 07:09:31PM -0700, Linus Torvalds wrote:
> On Mon, Aug 13, 2018 at 9:14 AM Matthew Wilcox <willy@infradead.org> wrote:
> >
> > Please consider pulling the XArray patch set.
>
> So this merge window has been horrible, but I was just about to start
> looking at it.
>
> And no. I'm not going to pull this.
>
> For some unfathomable reason, you have based it on the libnvdimm tree.
> I don't understand at all wjhy you did that.
I said in the pull request ...
There are two conflicts I wanted to flag; the first is against the
linux-nvdimm tree. I rebased on top of one of the branches that went
into that tree, so if you pull my tree before linux-nvdimm, you'll get
fifteen commits I've had no involvement with.
Dan asked me to do that so that his commit (which I had no involvement
with) would be easier to backport. At the time I thought this was a
reasonable request; I know this API change is disruptive and I wanted
to accommodate that. I didn't know his patch was "complete garbage";
I didn't review it.
So, should I have based just on your tree and sent you a description of
what a resolved conflict should look like?
> And since I won't be merging this, I clearly won't be merging your
> other pull request that depended on this either.
I can yank most of the patches (all but the last two, iirc) out of the
IDA patchset and submit those as a separate pull request. Would that
be acceptable? I'm really struggling to juggle all the pieces here to
get them merged.
next prev parent reply other threads:[~2018-08-22 2:50 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 [this message]
2018-08-22 3:00 ` Linus Torvalds
2018-08-22 18:23 ` Matthew Wilcox
2018-08-22 18:41 ` Linus Torvalds
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:
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=20180822025040.GA12244@bombadil.infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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).