From: Peter Maydell Date: Wed, 2 Feb 2022 09:05:56 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bsdimp/tags/bsd-user-fix-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f7c0e223acd5021d03736644cc0abf3501003820;p=qemu.git Merge remote-tracking branch 'remotes/bsdimp/tags/bsd-user-fix-pull-request' into staging Pull request Fix FreeBSD 12 and 13 builds. # gpg: Signature made Tue 01 Feb 2022 21:58:37 GMT # gpg: using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100 # gpg: Good signature from "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 2035 F894 B00A A3CF 7CCD E1B7 6C1C D128 7DB0 1100 * remotes/bsdimp/tags/bsd-user-fix-pull-request: bsd-user/signal.c: Only copy the _capsicum for FreeBSD_version > 1400026 Signed-off-by: Peter Maydell --- f7c0e223acd5021d03736644cc0abf3501003820