Merge remote-tracking branch 'remotes/kraxel/tags/misc-20170720-pull-request' into staging

qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

git orderfile and editorconfig for 2.10

# gpg: Signature made Thu 20 Jul 2017 09:00:01 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/misc-20170720-pull-request:
add editorconfig
add scripts/git.orderfile

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Peter Maydell 8 years ago 8dbcd0e5 87a60ee8

+44

2 changed files

expand all

.editorconfig

scripts

git.orderfile

+15

.editorconfig

··· 1 + # http://editorconfig.org 2 + root = true 3 + 4 + [*] 5 + end_of_line = lf 6 + insert_final_newline = true 7 + charset = utf-8 8 + 9 + [Makefile*] 10 + indent_style = tab 11 + indent_size = 8 12 + 13 + [*.{c,h}] 14 + indent_style = space 15 + indent_size = 4

+29

scripts/git.orderfile

··· 1 + # 2 + # order file for git, to produce patches which are easier to review 3 + # by diffing the important stuff like interface changes first. 4 + # 5 + # one-off usage: 6 + # git diff -O scripts/git.orderfile ... 7 + # 8 + # add to git config: 9 + # git config diff.orderFile scripts/git.orderfile 10 + # 11 + 12 + # Documentation 13 + docs/* 14 + *.texi 15 + 16 + # build system 17 + configure 18 + Makefile* 19 + *.mak 20 + 21 + # qapi schema 22 + *.json 23 + 24 + # headers 25 + *.h 26 + 27 + # code 28 + *.c 29 +