a20fd901af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABCAAGBQJX+LTGAAoJEHAbT2saaT5ZIBwH+wfho+xxruEjro6qPvSAtdKk
BBsOWBfBoqWfbAbOxxCO8ina2nA7p5XbyzSXUr94nZhvZMB9BkgL6la03gdS0Yr2
jHf0J9mM8fIbMQFsEKGOPcdpvU7VEXeFwridZYzypiRvbNSdWK3SKVBKgz2ADNhb
l4Tos81IZeH/mw8HcU3XgSGSTV4JuKP4XsnmwlFMa8/sWM/X3vVgx5IG26KURZQm
pW720jcX0meSfji5YvhspfbBbp1g2EorTZb6iLcZf+OUIB6XkViMisVasnyOo2HJ
cehPlhAHixwq1kXGItc1fs11VloZ6hvEZ7kZ615jAdsD2sGJObtGDxgyJW3+gPo=
=HPHj
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2016-10-08
# gpg: Signature made Sat 08 Oct 2016 09:56:38 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch: (26 commits)
net/filter-mirror: Fix mirror initial check typo
virtio: rename the bar index field name in VirtIOPCIProxy
linux-user: include <poll.h> instead of <sys/poll.h>
char: fix missing return in error path for chardev TLS init
CODING_STYLE: Fix a typo ("have" vs. "has")
bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK
build-sys: fix find-in-path
m68k: change default system clock for m5208evb
exec: remove unused compacted argument
usb: ehci: fix memory leak in ehci_process_itd
qapi: make the json schema files more regular.
maint: Add module_block.h to .gitignore
MAINTAINERS: Some updates related to the SH4 machines
MAINTAINERS: Add some more MIPS related files
MAINTAINERS: Add usermode related config files
MAINTAINERS: Add some more pattern to recognize all win32 related files
MAINTAINERS: Add some more rocker related files
MAINTAINERS: Add header files to CRIS section
MAINTAINERS: Add some more files to the virtio section
MAINTAINERS: Add some SPARC machine related files
...
# Conflicts:
# MAINTAINERS
118 lines
2 KiB
Plaintext
118 lines
2 KiB
Plaintext
/config-devices.*
|
|
/config-all-devices.*
|
|
/config-all-disas.*
|
|
/config-host.*
|
|
/config-target.*
|
|
/config.status
|
|
/config-temp
|
|
/trace-events-all
|
|
/trace/generated-tracers.h
|
|
/trace/generated-tracers.c
|
|
/trace/generated-tracers-dtrace.h
|
|
/trace/generated-tracers.dtrace
|
|
/trace/generated-events.h
|
|
/trace/generated-events.c
|
|
/trace/generated-helpers-wrappers.h
|
|
/trace/generated-helpers.h
|
|
/trace/generated-helpers.c
|
|
/trace/generated-tcg-tracers.h
|
|
/trace/generated-ust-provider.h
|
|
/trace/generated-ust.c
|
|
/ui/shader/texture-blit-frag.h
|
|
/ui/shader/texture-blit-vert.h
|
|
*-timestamp
|
|
/*-softmmu
|
|
/*-darwin-user
|
|
/*-linux-user
|
|
/*-bsd-user
|
|
/ivshmem-client
|
|
/ivshmem-server
|
|
/libdis*
|
|
/libuser
|
|
/linux-headers/asm
|
|
/qga/qapi-generated
|
|
/qapi-generated
|
|
/qapi-types.[ch]
|
|
/qapi-visit.[ch]
|
|
/qapi-event.[ch]
|
|
/qmp-commands.h
|
|
/qmp-introspect.[ch]
|
|
/qmp-marshal.c
|
|
/qemu-doc.html
|
|
/qemu-doc.info
|
|
/qemu-img
|
|
/qemu-nbd
|
|
/qemu-options.def
|
|
/qemu-options.texi
|
|
/qemu-img-cmds.texi
|
|
/qemu-img-cmds.h
|
|
/qemu-io
|
|
/qemu-ga
|
|
/qemu-bridge-helper
|
|
/qemu-monitor.texi
|
|
/qemu-monitor-info.texi
|
|
/qemu-version.h
|
|
/qemu-version.h.tmp
|
|
/module_block.h
|
|
/vscclient
|
|
/fsdev/virtfs-proxy-helper
|
|
*.[1-9]
|
|
*.a
|
|
*.aux
|
|
*.cp
|
|
*.dvi
|
|
*.exe
|
|
*.msi
|
|
*.dll
|
|
*.so
|
|
*.mo
|
|
*.fn
|
|
*.ky
|
|
*.log
|
|
*.pdf
|
|
*.pod
|
|
*.cps
|
|
*.fns
|
|
*.kys
|
|
*.pg
|
|
*.pyc
|
|
*.toc
|
|
*.tp
|
|
*.vr
|
|
*.d
|
|
!/scripts/qemu-guest-agent/fsfreeze-hook.d
|
|
*.o
|
|
*.lo
|
|
*.la
|
|
*.pc
|
|
.libs
|
|
.sdk
|
|
*.gcda
|
|
*.gcno
|
|
/pc-bios/bios-pq/status
|
|
/pc-bios/vgabios-pq/status
|
|
/pc-bios/optionrom/linuxboot.asm
|
|
/pc-bios/optionrom/linuxboot.bin
|
|
/pc-bios/optionrom/linuxboot.raw
|
|
/pc-bios/optionrom/linuxboot.img
|
|
/pc-bios/optionrom/linuxboot_dma.asm
|
|
/pc-bios/optionrom/linuxboot_dma.bin
|
|
/pc-bios/optionrom/linuxboot_dma.raw
|
|
/pc-bios/optionrom/linuxboot_dma.img
|
|
/pc-bios/optionrom/multiboot.asm
|
|
/pc-bios/optionrom/multiboot.bin
|
|
/pc-bios/optionrom/multiboot.raw
|
|
/pc-bios/optionrom/multiboot.img
|
|
/pc-bios/optionrom/kvmvapic.asm
|
|
/pc-bios/optionrom/kvmvapic.bin
|
|
/pc-bios/optionrom/kvmvapic.raw
|
|
/pc-bios/optionrom/kvmvapic.img
|
|
/pc-bios/s390-ccw/s390-ccw.elf
|
|
/pc-bios/s390-ccw/s390-ccw.img
|
|
.stgit-*
|
|
cscope.*
|
|
tags
|
|
TAGS
|
|
docker-src.*
|
|
*~
|