From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Gunthorpe <jgg@mellanox.com>
Cc: Matthew Wilcox <willy@infradead.org>,
Doug Ledford <dledford@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the xarray tree
Date: Thu, 21 Feb 2019 23:47:16 +1100 [thread overview]
Message-ID: <20190221234716.2144eba3@canb.auug.org.au> (raw)
In-Reply-To: <20190213220929.GO24706@mellanox.com>
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
Hi Jason,
On Wed, 13 Feb 2019 22:09:36 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> I personally think it is not good to put major logic changes in merge
> commits, so I would prefer the #2 approach for this case.
These are not difficult merge fixes or logic changes.
> Also, the general philosophy that the person doing the tree-wide
> change should do the work :)
In fact, I have done the work :-) All you guys have to do is inform
Linus and give him my resolutions. The change to xa_alloc_cyclic could
just be a followup patch once the air clears.
> SFR's tree is just a reference. Who ever takes care to resolve these
> conflicts has to manually do the fixing up. If you do send your tree
> early I will fix it up as part of prepping the RDMA tree PR. Otherwise
> you will have to fix it.
Neither of you need to fix it ...
> What I don't want to see is we send both trees at the same time and
> neither gives merge guidance to Linus.
Well, I have now reminded you both, so hopefully you will both tell
Linus.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-02-21 12:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 5:20 linux-next: build failure after merge of the xarray tree Stephen Rothwell
2019-02-12 16:15 ` Matthew Wilcox
2019-02-12 16:23 ` Jason Gunthorpe
2019-02-13 21:26 ` Matthew Wilcox
2019-02-13 22:09 ` Jason Gunthorpe
2019-02-21 12:47 ` Stephen Rothwell [this message]
2019-02-21 17:40 ` Jason Gunthorpe
-- strict thread matches above, loose matches on Subject: below --
2020-10-08 6:55 Stephen Rothwell
2020-10-08 14:09 ` Matthew Wilcox
2020-10-08 6:50 Stephen Rothwell
2019-02-21 6:13 Stephen Rothwell
2019-02-21 12:34 ` Leon Romanovsky
2019-02-21 12:48 ` Stephen Rothwell
2019-02-21 13:16 ` Leon Romanovsky
2019-02-21 13:23 ` Stephen Rothwell
2019-03-11 2:44 ` Matthew Wilcox
2019-03-11 12:13 ` Jason Gunthorpe
2019-03-11 12:31 ` Matthew Wilcox
2019-03-11 14:12 ` Jason Gunthorpe
2019-03-11 12:46 ` Leon Romanovsky
2018-06-18 3:27 Stephen Rothwell
2018-06-18 16:50 ` Dan Williams
2018-06-18 17:09 ` Matthew Wilcox
2018-06-27 3:09 ` Stephen Rothwell
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=20190221234716.2144eba3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.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).