diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-24 10:26:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-24 10:26:20 +0000 |
| commit | 38e83b6bed80ebabcbab22f9d5b5215071e32b52 (patch) | |
| tree | be99637e864b55323a80862352bd82c6dc65daf3 /scripts | |
| parent | c65d5e4e1d6841524c49a07bcdd56094f49982a4 (diff) | |
| parent | c1c4c2192c1c063a6c53c600bb97f20555b2a528 (diff) | |
| download | qemu-38e83b6bed80ebabcbab22f9d5b5215071e32b52.zip qemu-38e83b6bed80ebabcbab22f9d5b5215071e32b52.tar.gz qemu-38e83b6bed80ebabcbab22f9d5b5215071e32b52.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171124' into staging
Deal with the fallout from the deletion of the old s390 virtio header
in Linux master.
# gpg: Signature made Fri 24 Nov 2017 09:56:49 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20171124:
s390/kvm_virtio/linux-headers: remove traces of old virtio transport
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/update-linux-headers.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 76fd894..135a10d 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -95,7 +95,6 @@ for arch in $ARCHLIST; do rm -rf "$output/include/standard-headers/asm-$arch" mkdir -p "$output/include/standard-headers/asm-$arch" if [ $arch = s390 ]; then - cp_portable "$tmpdir/include/asm/kvm_virtio.h" "$output/include/standard-headers/asm-s390/" cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/" fi if [ $arch = arm ]; then |