Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging

diff --cc Makefile.target
Simple merge

diff --cc configure
Simple merge

diff --cc cpus.c
Simple merge

diff --cc hmp-commands.hx
Simple merge

diff --cc hw/arm_gic.c
Simple merge

diff --cc hw/eepro100.c
Simple merge

diff --cc hw/rtl8139.c
Simple merge

diff --cc migration.h
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc qapi-schema-guest.json
Simple merge

diff --cc qerror.c
Simple merge