diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-04-16 21:56:09 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-04-16 21:56:09 +0000 |
| commit | 98ba4471da6187346dbcc17cdf31671fb5d28b91 (patch) | |
| tree | ab986995f3b47702683d67bf783540c3ad27a0ab /arch/arm64/kernel | |
| parent | d5bc857aa45e817fd9eb6ba7311be5775a5ce08c (diff) | |
| parent | ab3bed80f9d34641966eaa329fc7b296a21dab07 (diff) | |
Merge tag 'v5.4.113' into 5.4-2.3.x-imx
This is the 5.4.113 stable release
Conflicts (manual resolve):
- drivers/gpu/drm/imx/imx-ldb.c:
Merge manually upstream commit 3c89c72404121 ("drm/imx: imx-ldb: fix out of
bounds array access warning") with NXP version if imx-ldb driver.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 61aa1efd1741..d65d6bd83331 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -277,7 +277,6 @@ static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = { * of support. */ S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64DFR0_PMUVER_SHIFT, 4, 0), - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_TRACEVER_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_DEBUGVER_SHIFT, 4, 0x6), ARM64_FTR_END, }; |