[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <aQWrh1ewMJRBKlmQ@gmail.com>
Date: Sat, 1 Nov 2025 07:41:11 +0100
From: Ingo Molnar <mingo@...nel.org>
To: Peter Zijlstra <peterz@...radead.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the tip tree
* Peter Zijlstra <peterz@...radead.org> wrote:
> On Fri, Oct 31, 2025 at 10:21:50AM +0100, Peter Zijlstra wrote:
> > On Fri, Oct 31, 2025 at 12:02:43PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the tip tree, today's linux-next build (arm64 defconfig)
> > > failed like this:
> >
> > arm64-defconfig builds just fine on tip/master, must be some conflict
> > with the arm64 tree or so. Let me go have a peek.
>
> N/m, someone removed core/rseq already.. *sigh*
Had to exclude it to fix -next, but it's still all there, just do:
git merge origin/core/rseq
... and it will merge cleanly.
Thanks,
Ingo
Powered by blists - more mailing lists