diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-03 18:26:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-03 18:26:21 +0100 |
| commit | e2a58ff493a2e00db3e963c1839c5374500110f2 (patch) | |
| tree | 1136df9621eb962326714fa330eaad310fb8de12 /scripts | |
| parent | ad88e4252f09c2956b99c90de39e95bab2e8e7af (diff) | |
| parent | c87759ce876a7a0b17c2bf4f0b964bd51f0ee871 (diff) | |
| download | qemu-e2a58ff493a2e00db3e963c1839c5374500110f2.zip qemu-e2a58ff493a2e00db3e963c1839c5374500110f2.tar.gz qemu-e2a58ff493a2e00db3e963c1839c5374500110f2.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Revert q35 to kernel irqchip (Alex)
* edu device fixes (Li Qiang)
* cleanups (Marc-André, Peter)
* Improvements to -accel help
* Better support for IA32_MISC_ENABLE MSR (Wanpeng)
* I2C test conversion to qgraph (Paolo)
# gpg: Signature made Mon 03 Jun 2019 14:20:12 BST
# gpg: using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream: (24 commits)
q35: Revert to kernel irqchip
configure: remove tpm_passthrough & tpm_emulator
ci: store Patchew configuration in the tree
libqos: i2c: move address into QI2CDevice
tests: convert ds1338-test to qtest
tests: convert OMAP i2c tests to qgraph
libqos: add ARM imx25-pdk machine object
libqos: add ARM n800 machine object
libqos: convert I2C to qgraph
libqos: split I2CAdapter initialization and allocation
imx25-pdk: create ds1338 for qtest inside the test
pca9552-test: do not rely on state across tests
libqos: fix omap-i2c receiving more than 4 bytes
libqos: move common i2c code to libqos
qgraph: fix qos_node_contains with options
qgraph: allow extra_device_opts on contains nodes
edu: uses uint64_t in dma operation
edu: mmio: allow 64-bit access in read dispatch
edu: mmio: allow 64-bit access
i386: Enable IA32_MISC_ENABLE MWAIT bit when exposing mwait/monitor
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 88682cb..c2aaf42 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1949,7 +1949,8 @@ sub process { } # no C99 // comments - if ($line =~ m{//}) { + if ($line =~ m{//} && + $rawline !~ m{// SPDX-License-Identifier: }) { ERROR("do not use C99 // comments\n" . $herecurr); } # Remove C99 comments. |