[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20200731200250.10150100@canb.auug.org.au>
Date: Fri, 31 Jul 2020 20:02:50 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ingo Molnar <mingo@...nel.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Grygorii Strashko <grygorii.strashko@...com>,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: linux-next: build failure after merge of the tip tree
Hi Ingo,
On Fri, 31 Jul 2020 11:57:35 +0200 Ingo Molnar <mingo@...nel.org> wrote:
>
> I've merged Linus's latest into tip:locking/core, keeping the simpler
> solution of a6342915881a and reducing the dependency hell.
>
> Will push it all out hopefully later today (unrelated changes need
> more testing), from that point on there should be no conflict in
> -next.
>
> My plan would be to send that resolution to Linus, under the
> assumption that a6342915881a is superior to the upstream aa54ea903abb
> solution.
Sounds good to me, thanks.
(though, no rush on my account as I won't do another linux-next until
Monday)
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists