Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Fri, 6 Oct 2023 07:50:27 +0100
From:   Sudeep Holla <sudeep.holla@arm.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     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 scmi tree
Message-ID: <20231006065027.oylmg76qyt5ni2wj@bogus>
References: <20231006103929.4c56edb3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231006103929.4c56edb3@canb.auug.org.au>
Precedence: bulk

On Fri, Oct 06, 2023 at 10:39:29AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the scmi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from drivers/tee/optee/ffa_abi.c:8:
> include/linux/arm_ffa.h: In function 'ffa_mem_desc_offset':
> include/linux/arm_ffa.h:105:10: error: implicit declaration of function 'FIELD_PREP' [-Werror=implicit-function-declaration]
>   105 |         (FIELD_PREP(FFA_MAJOR_VERSION_MASK, (major)) |          \
>       |          ^~~~~~~~~~
> include/linux/arm_ffa.h:107:33: note: in expansion of macro 'FFA_PACK_VERSION_INFO'
>   107 | #define FFA_VERSION_1_0         FFA_PACK_VERSION_INFO(1, 0)
>       |                                 ^~~~~~~~~~~~~~~~~~~~~
> include/linux/arm_ffa.h:368:28: note: in expansion of macro 'FFA_VERSION_1_0'
>   368 |         if (ffa_version <= FFA_VERSION_1_0)
>       |                            ^~~~~~~~~~~~~~~
> 
> Exposed by commit
> 
>   0624de756f75 ("firmware: arm_ffa: Update memory descriptor to support v1.1 format")
> 
> This has been possible for a while, and arm_ffa.h needs to include
> linus/bitfoeld.h ...
>

Indeed.

> I have used the scmi tree from next-20231005 for today.
>

Thanks for the report, will fix it up.

> -- 
> Cheers,
> Stephen Rothwell


-- 
Regards,
Sudeep