aboutsummaryrefslogtreecommitdiff
path: root/scripts/shaderinclude.py
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2024-06-04 05:23:20 -0500
committerRichard Henderson <richard.henderson@linaro.org>2024-06-04 05:23:20 -0500
commit121e47c8bff8013bdce1ae2ae79bd2e16260c512 (patch)
tree3319f45faf9dda7801a1be2046f6b8a17a067227 /scripts/shaderinclude.py
parentd67a6e054b92e5e1cbb7b0bd5782a670cc7f0df7 (diff)
parenta73c99378022ebb785481e84cfe1e81097546268 (diff)
downloadqemu-121e47c8bff8013bdce1ae2ae79bd2e16260c512.zip
qemu-121e47c8bff8013bdce1ae2ae79bd2e16260c512.tar.gz
qemu-121e47c8bff8013bdce1ae2ae79bd2e16260c512.tar.bz2
Merge tag 'pull-nbd-2024-05-30-v2' of https://repo.or.cz/qemu/ericb into staging
NBD patches for 2024-05-30 - Fix AioContext assertion with NBD+TLS # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmZd0MYACgkQp6FrSiUn # Q2rrxwf8C+nhCy5d/d0DfBvDANEWB5zFGffC89t9P2ULJ6ehGlZuAyF8bCqnptPM # 76qhZfCz1XCUM0B+H+JXzcOsphTY5Y+hQ6Aq95VbuJgzq4CbAz4D30RNS0P5Q/ei # v1+goMTEegH1sSS6b0NueTj4chesMui3bJpiUnb3qPptZ+L0OWhIsk6Pe0N418UM # kmWC3kPWUPkmpxqXprcV/OunS6ipkfSVORfjxFNbFQcceuP45lt+f0YxhMHU8NIU # PwFiUaPPCy/mDFTHgqCmpqoivFroUyhQIFl5ucHmds2wTOTx9VpxunYNcrVCq6vY # UUfKc/p5lRArTqJXEth8cHlo1sFOEw== # =7ZGy # -----END PGP SIGNATURE----- # gpg: Signature made Mon 03 Jun 2024 09:18:46 AM CDT # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] * tag 'pull-nbd-2024-05-30-v2' of https://repo.or.cz/qemu/ericb: iotests: test NBD+TLS+iothread qio: Inherit follow_coroutine_ctx across TLS Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'scripts/shaderinclude.py')
0 files changed, 0 insertions, 0 deletions