summary refs log tree commit diff stats
path: root/scripts/nsis.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-11-17 22:06:40 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-11-17 22:06:40 +0000
commit4b52475866c90dfcc7b78404d365bb73ea1e39b7 (patch)
tree99588612a1c75700d6681105ed56554391dc4f8f /scripts/nsis.py
parent84dae210506784945ec8342a613d7bd62ae6ec62 (diff)
parent5351f4075dc17825df8e0628a93f9baa9b9bda4b (diff)
downloadfocaccia-qemu-4b52475866c90dfcc7b78404d365bb73ea1e39b7.tar.gz
focaccia-qemu-4b52475866c90dfcc7b78404d365bb73ea1e39b7.zip
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging
Fix netlink with latest iproute

# gpg: Signature made Tue 17 Nov 2020 15:16:26 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-5.2-pull-request:
  linux-user,netlink: add IFLA_BRPORT_MRP_RING_OPEN, IFLA_BRPORT_MRP_IN_OPEN
  linux-user,netlink: fix message translation with ip command

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/nsis.py')
0 files changed, 0 insertions, 0 deletions