Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging

.gitignore updates for v4.0

# gpg: Signature made Thu 14 Mar 2019 15:04:29 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# 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/trivial-branch-pull-request:
  tests/.gitignore: ignore test-qapi-emit-events.[ch] for in-tree builds
  .gitignore: ignore docs/built created for in-tree builds
  maint: Ignore built elf2dmp

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2019-03-14 16:19:37 +00:00
2 changed files with 3 additions and 0 deletions
+2
View File
@@ -6,6 +6,7 @@
/config-target.*
/config.status
/config-temp
/elf2dmp
/trace-events-all
/trace/generated-events.h
/trace/generated-events.c
@@ -119,6 +120,7 @@
/pc-bios/optionrom/kvmvapic.img
/pc-bios/s390-ccw/s390-ccw.elf
/pc-bios/s390-ccw/s390-ccw.img
/docs/built
/docs/interop/qemu-ga-qapi.texi
/docs/interop/qemu-ga-ref.html
/docs/interop/qemu-ga-ref.info*
+1
View File
@@ -14,6 +14,7 @@ test-*
test-qapi-commands.[ch]
include/test-qapi-commands-sub-module.[ch]
test-qapi-commands-sub-sub-module.[ch]
test-qapi-emit-events.[ch]
test-qapi-events.[ch]
include/test-qapi-events-sub-module.[ch]
test-qapi-events-sub-sub-module.[ch]