Messages in this thread Patch in this message | | | Date | Tue, 27 Oct 2020 15:14:14 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the vfs tree |
| |
Hi all,
After merging the vfs tree, today's linux-next build (sparc_defconfig) failed like this:
arch/sparc/lib/memset.S: Assembler messages: arch/sparc/lib/memset.S:149: Error: Unknown opcode: `ext(12b, 13b,21f)'
Caused by commit
0e0bbae08a6e ("sparc32: switch __bzero() away from range exception table entries")
merging badly with commit
7780918b3648 ("sparc32: fix a user-triggerable oops in clear_user()")
from the sparc tree.
The sparc tree commit above appears as commit
80537bbf19d6 ("sparc32: fix a user-triggerable oops in clear_user()")
in the vfs tree as well. The patch adds one line which is later removed by commit
0e0bbae08a6e ("sparc32: switch __bzero() away from range exception table entries")
in the vfs tree, but the git merge puts the line back again :-(
I have added the following fix to the vfs tree merge
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 27 Oct 2020 15:05:28 +1100 Subject: [PATCH] fix up for merge of arch/sparc/lib/memset.S
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/sparc/lib/memset.S | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S index 522f45a952a0..eaff68213fdf 100644 --- a/arch/sparc/lib/memset.S +++ b/arch/sparc/lib/memset.S @@ -146,7 +146,6 @@ __bzero: ZERO_LAST_BLOCKS(%o0, 0x48, %g2) ZERO_LAST_BLOCKS(%o0, 0x08, %g2) 13: - EXT(12b, 13b, 21f) be 8f andcc %o1, 4, %g0 -- 2.28.0 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |