Same. None of these will cause a conflict. I'll make sure any out of tree files are updated... though cut and paste rarely flows from these files.
> 09.09.2023 16:12, Michael Tokarev:
>> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
>> ---
>> bsd-user/errno_defs.h | 2 +-
>> bsd-user/freebsd/target_os_siginfo.h | 2 +-
>> bsd-user/freebsd/target_os_stack.h | 4 ++--
>> bsd-user/freebsd/target_os_user.h | 2 +-
>> bsd-user/qemu.h | 2 +-
>> bsd-user/signal-common.h | 4 ++--
>> bsd-user/signal.c | 6 +++---
>> 7 files changed, 11 insertions(+), 11 deletions(-)
>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>