https://bugs.kde.org/show_bug.cgi?id=385412
--- Comment #22 from Julian Seward <jsew...@acm.org> --- Hmm, the first two patches apply without problem. But the third one fails as follows. Vadim, can you please check they actually apply to the trunk, for you, and if not, update them so they do? Also please can you clarify what order they should be applied it. I guessed this, but I am not sure: bug385412_1_Non-vector_z13_support.diff bug385412_2_s390x_tests_formatting_fixes_for_z13.c bug385412_3_PPNO_fix_and_refactoring.diff _1_ and _2_ apply OK. But _3_ fails thusly: $ patch -p1 --dry-run < ../trunk/bug385412_3_PPNO_fix_and_refactoring.diff checking file .gitignore checking file VEX/priv/guest_s390_toIR.c checking file none/tests/s390x/Makefile.am checking file none/tests/s390x/ppno.c checking file none/tests/s390x/ppno.stderr.exp checking file none/tests/s390x/ppno.stdout.exp checking file none/tests/s390x/ppno.vgtest checking file none/tests/s390x/z13.c checking file none/tests/s390x/z13.stdout.exp checking file none/tests/s390x/z13.vgtest checking file .gitignore Hunk #1 FAILED at 1875. 1 out of 1 hunk FAILED checking file none/tests/s390x/Makefile.am Hunk #1 FAILED at 18. 1 out of 2 hunks FAILED checking file none/tests/s390x/lsc2.c (renamed from none/tests/s390x/z13.c) checking file none/tests/s390x/lsc2.stderr.exp (renamed from none/tests/s390x/z13.stderr.exp) checking file none/tests/s390x/lsc2.stdout.exp (renamed from none/tests/s390x/z13.stdout.exp) checking file none/tests/s390x/lsc2.vgtest checking file none/tests/s390x/z13.vgtest Not deleting file none/tests/s390x/z13.vgtest as content differs from patch checking file VEX/priv/guest_s390_defs.h checking file VEX/priv/guest_s390_helpers.c checking file VEX/priv/guest_s390_toIR.c Hunk #2 FAILED at 15871. Hunk #5 FAILED at 15944. Hunk #6 FAILED at 15954. 3 out of 6 hunks FAILED -- You are receiving this mail because: You are watching all bug changes.
