linux-kernel - Re: linux-next: build failure after merge of the xarray tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190221234716.2144eba3@canb.auug.org.au>
Date:   Thu, 21 Feb 2019 23:47:16 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jason Gunthorpe <jgg@...lanox.com>
Cc:     Matthew Wilcox <willy@...radead.org>,
        Doug Ledford <dledford@...hat.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the xarray tree

Hi Jason,

On Wed, 13 Feb 2019 22:09:36 +0000 Jason Gunthorpe <jgg@...lanox.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

Content of type "application/pgp-signature" skipped