Switched to a new branch '20240903152757.17935-1-philmd@linaro.org'
Applying: target/cris: Remove the deprecated CRIS target
Using index info to reconstruct a base tree...
M	.gitlab-ci.d/buildtest.yml
M	.gitlab-ci.d/container-cross.yml
M	.gitlab-ci.d/crossbuild-template.yml
M	MAINTAINERS
A	configs/devices/cris-softmmu/default.mak
A	configs/targets/cris-linux-user.mak
A	configs/targets/cris-softmmu.mak
M	configure
A	disas/cris.c
M	disas/meson.build
M	docs/about/deprecated.rst
M	docs/about/emulation.rst
M	docs/about/removed-features.rst
M	docs/user/main.rst
M	fpu/softfloat-specialize.c.inc
M	hw/Kconfig
A	hw/char/etraxfs_ser.c
M	hw/char/meson.build
A	hw/cris/Kconfig
A	hw/cris/axis_dev88.c
A	hw/cris/boot.c
A	hw/cris/boot.h
A	hw/cris/meson.build
A	hw/dma/etraxfs_dma.c
M	hw/dma/meson.build
A	hw/intc/etraxfs_pic.c
M	hw/intc/meson.build
M	hw/meson.build
A	hw/net/etraxfs_eth.c
M	hw/net/meson.build
M	hw/net/trace-events
A	hw/timer/etraxfs_timer.c
M	hw/timer/meson.build
M	include/disas/dis-asm.h
M	include/exec/poison.h
A	include/hw/cris/etraxfs.h
A	include/hw/cris/etraxfs_dma.h
A	include/sysemu/arch_init.h
M	include/user/abitypes.h
A	linux-user/cris/cpu_loop.c
A	linux-user/cris/signal.c
A	linux-user/cris/sockbits.h
A	linux-user/cris/syscall_nr.h
A	linux-user/cris/target_cpu.h
A	linux-user/cris/target_elf.h
A	linux-user/cris/target_errno_defs.h
A	linux-user/cris/target_fcntl.h
A	linux-user/cris/target_mman.h
A	linux-user/cris/target_prctl.h
A	linux-user/cris/target_proc.h
A	linux-user/cris/target_resource.h
A	linux-user/cris/target_signal.h
A	linux-user/cris/target_structs.h
A	linux-user/cris/target_syscall.h
A	linux-user/cris/termbits.h
M	linux-user/elfload.c
M	linux-user/syscall.c
M	linux-user/syscall_defs.h
M	meson.build
M	qapi/machine.json
M	scripts/coverity-scan/COMPONENTS.md
M	scripts/probe-gdb-support.py
M	system/qemu-seccomp.c
M	target/Kconfig
A	target/cris/Kconfig
A	target/cris/cpu-param.h
A	target/cris/cpu-qom.h
A	target/cris/cpu.c
A	target/cris/cpu.h
A	target/cris/crisv10-decode.h
A	target/cris/crisv32-decode.h
A	target/cris/gdbstub.c
A	target/cris/helper.c
A	target/cris/helper.h
A	target/cris/machine.c
A	target/cris/meson.build
A	target/cris/mmu.c
A	target/cris/mmu.h
A	target/cris/op_helper.c
A	target/cris/opcode-cris.h
A	target/cris/translate.c
A	target/cris/translate_v10.c.inc
M	target/meson.build
M	tests/data/qobject/qdict.txt
M	tests/docker/Makefile.include
A	tests/docker/dockerfiles/fedora-cris-cross.docker
M	tests/qtest/machine-none-test.c
A	tests/tcg/cris/.gdbinit
A	tests/tcg/cris/Makefile.target
A	tests/tcg/cris/README
A	tests/tcg/cris/bare/check_addcv17.s
A	tests/tcg/cris/bare/check_addi.s
A	tests/tcg/cris/bare/check_addiv32.s
A	tests/tcg/cris/bare/check_addm.s
A	tests/tcg/cris/bare/check_addq.s
A	tests/tcg/cris/bare/check_addr.s
A	tests/tcg/cris/bare/check_addxc.s
A	tests/tcg/cris/bare/check_addxm.s
A	tests/tcg/cris/bare/check_addxr.s
A	tests/tcg/cris/bare/check_andc.s
A	tests/tcg/cris/bare/check_andm.s
A	tests/tcg/cris/bare/check_andq.s
A	tests/tcg/cris/bare/check_andr.s
A	tests/tcg/cris/bare/check_asr.s
A	tests/tcg/cris/bare/check_ba.s
A	tests/tcg/cris/bare/check_bas.s
A	tests/tcg/cris/bare/check_bcc.s
A	tests/tcg/cris/bare/check_boundc.s
A	tests/tcg/cris/bare/check_boundr.s
A	tests/tcg/cris/bare/check_btst.s
A	tests/tcg/cris/bare/check_clearfv32.s
A	tests/tcg/cris/bare/check_clrjmp1.s
A	tests/tcg/cris/bare/check_cmp-2.s
A	tests/tcg/cris/bare/check_cmpc.s
A	tests/tcg/cris/bare/check_cmpm.s
A	tests/tcg/cris/bare/check_cmpq.s
A	tests/tcg/cris/bare/check_cmpr.s
A	tests/tcg/cris/bare/check_cmpxc.s
A	tests/tcg/cris/bare/check_cmpxm.s
A	tests/tcg/cris/bare/check_dstep.s
A	tests/tcg/cris/bare/check_jsr.s
A	tests/tcg/cris/bare/check_lapc.s
A	tests/tcg/cris/bare/check_lsl.s
A	tests/tcg/cris/bare/check_lsr.s
A	tests/tcg/cris/bare/check_mcp.s
A	tests/tcg/cris/bare/check_movdelsr1.s
A	tests/tcg/cris/bare/check_movecr.s
A	tests/tcg/cris/bare/check_movei.s
A	tests/tcg/cris/bare/check_movemr.s
A	tests/tcg/cris/bare/check_movemrv32.s
A	tests/tcg/cris/bare/check_mover.s
A	tests/tcg/cris/bare/check_moverm.s
A	tests/tcg/cris/bare/check_movmp.s
A	tests/tcg/cris/bare/check_movpmv32.s
A	tests/tcg/cris/bare/check_movpr.s
A	tests/tcg/cris/bare/check_movprv32.s
A	tests/tcg/cris/bare/check_movscr.s
A	tests/tcg/cris/bare/check_movsm.s
A	tests/tcg/cris/bare/check_movsr.s
A	tests/tcg/cris/bare/check_movucr.s
A	tests/tcg/cris/bare/check_movum.s
A	tests/tcg/cris/bare/check_movur.s
A	tests/tcg/cris/bare/check_mulv32.s
A	tests/tcg/cris/bare/check_mulx.s
A	tests/tcg/cris/bare/check_neg.s
A	tests/tcg/cris/bare/check_not.s
A	tests/tcg/cris/bare/check_orc.s
A	tests/tcg/cris/bare/check_orm.s
A	tests/tcg/cris/bare/check_orq.s
A	tests/tcg/cris/bare/check_orr.s
A	tests/tcg/cris/bare/check_ret.s
A	tests/tcg/cris/bare/check_scc.s
A	tests/tcg/cris/bare/check_subc.s
A	tests/tcg/cris/bare/check_subm.s
A	tests/tcg/cris/bare/check_subq.s
A	tests/tcg/cris/bare/check_subr.s
A	tests/tcg/cris/bare/check_xarith.s
A	tests/tcg/cris/bare/crt.s
A	tests/tcg/cris/bare/sys.c
A	tests/tcg/cris/bare/testutils.inc
A	tests/tcg/cris/libc/check_abs.c
A	tests/tcg/cris/libc/check_addc.c
A	tests/tcg/cris/libc/check_addcm.c
A	tests/tcg/cris/libc/check_addo.c
A	tests/tcg/cris/libc/check_addoq.c
A	tests/tcg/cris/libc/check_bound.c
A	tests/tcg/cris/libc/check_ftag.c
A	tests/tcg/cris/libc/check_gcctorture_pr28634-1.c
A	tests/tcg/cris/libc/check_gcctorture_pr28634.c
A	tests/tcg/cris/libc/check_glibc_kernelversion.c
A	tests/tcg/cris/libc/check_hello.c
A	tests/tcg/cris/libc/check_int64.c
A	tests/tcg/cris/libc/check_lz.c
A	tests/tcg/cris/libc/check_mapbrk.c
A	tests/tcg/cris/libc/check_mmap1.c
A	tests/tcg/cris/libc/check_mmap2.c
A	tests/tcg/cris/libc/check_mmap3.c
A	tests/tcg/cris/libc/check_moveq.c
A	tests/tcg/cris/libc/check_openpf1.c
A	tests/tcg/cris/libc/check_openpf2.c
A	tests/tcg/cris/libc/check_openpf3.c
A	tests/tcg/cris/libc/check_openpf5.c
A	tests/tcg/cris/libc/check_settls1.c
A	tests/tcg/cris/libc/check_sigalrm.c
A	tests/tcg/cris/libc/check_stat1.c
A	tests/tcg/cris/libc/check_stat2.c
A	tests/tcg/cris/libc/check_stat3.c
A	tests/tcg/cris/libc/check_stat4.c
A	tests/tcg/cris/libc/check_swap.c
A	tests/tcg/cris/libc/check_time2.c
A	tests/tcg/cris/libc/crisutils.h
A	tests/tcg/cris/libc/sys.h
Falling back to patching base and 3-way merge...
Auto-merging tests/qtest/machine-none-test.c
Auto-merging tests/docker/Makefile.include
CONFLICT (rename/delete): target/cris/cpu-qom.h deleted in target/cris: Remove the deprecated CRIS target and renamed to target/microblaze/cpu-qom.h in HEAD. Version HEAD of target/microblaze/cpu-qom.h left in tree.
Auto-merging system/qemu-seccomp.c
Auto-merging scripts/probe-gdb-support.py
CONFLICT (content): Merge conflict in scripts/probe-gdb-support.py
Auto-merging scripts/coverity-scan/COMPONENTS.md
Auto-merging qapi/machine.json
Auto-merging meson.build
Auto-merging linux-user/syscall_defs.h
Auto-merging linux-user/syscall.c
CONFLICT (content): Merge conflict in linux-user/syscall.c
CONFLICT (rename/delete): linux-user/cris/cpu_loop.c deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/sh4/cpu_loop.c in HEAD. Version HEAD of linux-user/sh4/cpu_loop.c left in tree.
CONFLICT (rename/delete): linux-user/cris/target_cpu.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/microblaze/target_cpu.h in HEAD. Version HEAD of linux-user/microblaze/target_cpu.h left in tree.
CONFLICT (rename/delete): linux-user/cris/target_fcntl.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/i386/target_fcntl.h in HEAD. Version HEAD of linux-user/i386/target_fcntl.h left in tree.
CONFLICT (rename/delete): linux-user/cris/target_proc.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/hexagon/target_proc.h in HEAD. Version HEAD of linux-user/hexagon/target_proc.h left in tree.
Auto-merging linux-user/elfload.c
CONFLICT (rename/delete): linux-user/cris/target_prctl.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/arm/target_prctl.h in HEAD. Version HEAD of linux-user/arm/target_prctl.h left in tree.
CONFLICT (rename/delete): linux-user/cris/target_errno_defs.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/arm/target_errno_defs.h in HEAD. Version HEAD of linux-user/arm/target_errno_defs.h left in tree.
CONFLICT (rename/delete): linux-user/cris/target_elf.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/arm/target_elf.h in HEAD. Version HEAD of linux-user/arm/target_elf.h left in tree.
CONFLICT (rename/delete): linux-user/cris/target_structs.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/aarch64/target_structs.h in HEAD. Version HEAD of linux-user/aarch64/target_structs.h left in tree.
CONFLICT (rename/delete): linux-user/cris/target_resource.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/aarch64/target_resource.h in HEAD. Version HEAD of linux-user/aarch64/target_resource.h left in tree.
CONFLICT (rename/delete): linux-user/cris/sockbits.h deleted in target/cris: Remove the deprecated CRIS target and renamed to linux-user/aarch64/sockbits.h in HEAD. Version HEAD of linux-user/aarch64/sockbits.h left in tree.
Auto-merging include/system/arch_init.h
CONFLICT (rename/delete): include/hw/cris/etraxfs.h deleted in target/cris: Remove the deprecated CRIS target and renamed to include/hw/net/lance.h in HEAD. Version HEAD of include/hw/net/lance.h left in tree.
Auto-merging include/exec/poison.h
Auto-merging hw/timer/meson.build
Auto-merging hw/net/trace-events
CONFLICT (content): Merge conflict in hw/net/trace-events
Auto-merging hw/net/meson.build
Auto-merging hw/meson.build
Auto-merging hw/intc/meson.build
Auto-merging hw/dma/meson.build
Auto-merging hw/char/meson.build
Auto-merging hw/Kconfig
Auto-merging fpu/softfloat-specialize.c.inc
CONFLICT (content): Merge conflict in fpu/softfloat-specialize.c.inc
Auto-merging docs/user/main.rst
Auto-merging docs/about/removed-features.rst
Auto-merging docs/about/emulation.rst
Auto-merging docs/about/deprecated.rst
CONFLICT (content): Merge conflict in docs/about/deprecated.rst
Auto-merging configure
CONFLICT (rename/delete): configs/devices/cris-softmmu/default.mak deleted in target/cris: Remove the deprecated CRIS target and renamed to configs/devices/avr-softmmu/default.mak in HEAD. Version HEAD of configs/devices/avr-softmmu/default.mak left in tree.
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Auto-merging .gitlab-ci.d/crossbuild-template.yml
Auto-merging .gitlab-ci.d/container-cross.yml
CONFLICT (content): Merge conflict in .gitlab-ci.d/container-cross.yml
Auto-merging .gitlab-ci.d/buildtest.yml
CONFLICT (content): Merge conflict in .gitlab-ci.d/buildtest.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 target/cris: Remove the deprecated CRIS target
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".