]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 17 Nov 2020 22:06:40 +0000 (22:06 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 17 Nov 2020 22:06:40 +0000 (22:06 +0000)
commit4b52475866c90dfcc7b78404d365bb73ea1e39b7
tree99588612a1c75700d6681105ed56554391dc4f8f
parent84dae210506784945ec8342a613d7bd62ae6ec62
parent5351f4075dc17825df8e0628a93f9baa9b9bda4b
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>