Sent before actually noticing that my master branch didn't push - it's
late in the day. Wearing my pink bunny ears for the evening <sigh>...
Fixed up the commit and push was successful.
John
On 01/10/2018 05:33 PM, John Ferlan wrote:
Commit/push resulted in following error:
remote: tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo:5: trailing whitespace.
remote: +features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie
remote: error: hook declined to update refs/heads/master
Just removed the trailing whitespace.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
Missed this during 'git am' processing and the syntax-check didn't find it
either, but the push hook did. Just update the file to remove the trailing
whitespace (built and tested just fine).
tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo
b/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo
index 0edc371dd..b50aa18c3 100644
--- a/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo
+++ b/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo
@@ -2,7 +2,7 @@ vendor_id : IBM/S390
# processors : 8
bogomips per cpu: 20325.00
max thread id : 1
-features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie
+features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie
facilities : 0 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
27 28 30 31 32 33 34 35 36 37 40 41 42 43 44 45 46 47 48 49 50 51 52 53 55 57 64 65 66 67
68 69 70 71 72 73 75 76 77 78 80 128 129 131 132 142 143
cache0 : level=1 type=Data scope=Private size=128K line_size=256
associativity=8
cache1 : level=1 type=Instruction scope=Private size=96K line_size=256
associativity=6