In message: [linux-yocto][v5.10/standard/cn-sdkv5.4/octeon][PATCH] Fix
cpucaps.h build error
on 24/10/2024 jinfeng.wang...@windriver.com wrote:
> From: Jinfeng Wang <jinfeng.wang...@windriver.com>
>
> Remove useless string to fix the following error:
> cpucaps.h:67:1: error: expected identifier or '(' before '<<' token
> 67 | <<<<<< HEAD
merged.
Although that should have been impossible (clearly it
isn't), since my scripts test for merge markers and
won't continue merges until they are resolved.
Bruce)
>
> Signed-off-by: Jinfeng Wang <jinfeng.wang...@windriver.com>
> ---
> arch/arm64/include/asm/cpucaps.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/cpucaps.h
> b/arch/arm64/include/asm/cpucaps.h
> index d1569e034108..97807a163324 100644
> --- a/arch/arm64/include/asm/cpucaps.h
> +++ b/arch/arm64/include/asm/cpucaps.h
> @@ -64,7 +64,6 @@
> #define ARM64_HAS_TLB_RANGE 56
> #define ARM64_MTE 57
> #define ARM64_WORKAROUND_1508412 58
> -<<<<<< HEAD
> #define ARM64_WORKAROUND_CAVIUM_36890 59
> #define ARM64_WORKAROUND_MRVL_38500 60
> #define ARM64_WORKAROUND_MRVL_38545 61
> --
> 2.34.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14517):
https://lists.yoctoproject.org/g/linux-yocto/message/14517
Mute This Topic: https://lists.yoctoproject.org/mt/109185978/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
