Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Wed, 13 Dec 2023 09:30:57 +0000
From:   Will Deacon <will@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>, james.clark@arm.com
Cc:     Catalin Marinas <catalin.marinas@arm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the arm-perf tree
Message-ID: <20231213093057.GA31075@willie-the-truck>
References: <20231213100931.12d9d85e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231213100931.12d9d85e@canb.auug.org.au>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

Hi Stephen, [+James]

On Wed, Dec 13, 2023 at 10:09:31AM +1100, Stephen Rothwell wrote:
> After merging the arm-perf tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/perf/arm_dmc620_pmu.c:26:
> include/linux/perf/arm_pmu.h:15:10: fatal error: asm/cputype.h: No such file or directory
>    15 | #include <asm/cputype.h>
>       |          ^~~~~~~~~~~~~~~

Damn, I tested with allnoconfig, defconfig and allmodconfig before I pushed,
but only for ARCH=arm64. Thanks for reporting this.

> I can't easily tell what caused this - possibly commit
> 
>   a5f4ca68f348 ("perf/arm_dmc620: Remove duplicate format attribute #defines")
> 
> I have used the arm-perf and arm64 trees from next-20231212 for today
> (since the arm64 tree merged the arm-perf tree).

That looks likely. I'll try reverting it and see if it resolves the problem
locally.

Cheers,

Will