Originally posted by MWisBest
View Post
This should be obvious by now
patching file src/gallium/drivers/r600/r600_asm.c Hunk #1 FAILED at 1535. 1 out of 1 hunk FAILED -- saving rejects to file src/gallium/drivers/r600/r600_asm.c.rej patching file src/gallium/drivers/r600/r600_pipe.c Hunk #1 FAILED at 372. Hunk #2 FAILED at 458. 2 out of 2 hunks FAILED -- saving rejects to file src/gallium/drivers/r600/r600_pipe.c.rej patching file src/gallium/drivers/r600/r600_pipe.h Hunk #1 succeeded at 159 (offset -1 lines). Hunk #2 succeeded at 546 (offset -20 lines). patching file src/gallium/drivers/r600/r600_shader.c Hunk #1 FAILED at 210. Hunk #2 succeeded at 181 with fuzz 2 (offset -39 lines). Hunk #3 FAILED at 909. Hunk #4 FAILED at 1232. Hunk #5 FAILED at 1552. Hunk #6 succeeded at 6122 (offset -178 lines). 4 out of 6 hunks FAILED -- saving rejects to file src/gallium/drivers/r600/r600_shader.c.rej patching file src/gallium/drivers/r600/r600_state.c Hunk #1 succeeded at 2067 (offset 3 lines). Hunk #2 succeeded at 2119 (offset 3 lines). Hunk #3 succeeded at 2140 (offset 3 lines). Hunk #4 succeeded at 2326 (offset 3 lines). Hunk #5 succeeded at 2455 (offset 3 lines). Hunk #6 succeeded at 2467 (offset 3 lines). Hunk #7 succeeded at 2590 (offset 3 lines). Hunk #8 succeeded at 2611 (offset 3 lines). Hunk #9 succeeded at 2626 (offset 3 lines). Hunk #10 succeeded at 2805 (offset 3 lines). Hunk #11 succeeded at 2819 (offset 3 lines). Hunk #12 succeeded at 2829 (offset 3 lines). Hunk #13 succeeded at 3002 (offset 3 lines). Hunk #14 succeeded at 3452 (offset 3 lines). patching file src/gallium/drivers/r600/r600_state_common.c Hunk #1 FAILED at 1162. 1 out of 1 hunk FAILED -- saving rejects to file src/gallium/drivers/r600/r600_state_common.c.rej patching file src/gallium/drivers/r600/r600d.h Hunk #1 succeeded at 200 (offset -1 lines). Hunk #2 succeeded at 1837 (offset -1 lines). Hunk #3 succeeded at 2353 (offset -1 lines). Hunk #4 succeeded at 2462 (offset -1 lines). Hunk #5 succeeded at 2908 (offset -1 lines). patch unexpectedly ends in middle of line Hunk #6 succeeded at 3333 with fuzz 1 (offset -1 lines).
patching file src/gallium/drivers/r600/r600_asm.c Hunk #1 FAILED at 1535. 1 out of 1 hunk FAILED -- saving rejects to file src/gallium/drivers/r600/r600_asm.c.rej patching file src/gallium/drivers/r600/r600_pipe.c Hunk #1 FAILED at 372. Hunk #2 FAILED at 458. 2 out of 2 hunks FAILED -- saving rejects to file src/gallium/drivers/r600/r600_pipe.c.rej patching file src/gallium/drivers/r600/r600_pipe.h Hunk #1 succeeded at 159 (offset -1 lines). Hunk #2 succeeded at 546 (offset -20 lines). patching file src/gallium/drivers/r600/r600_shader.c Hunk #1 FAILED at 210. Hunk #2 succeeded at 181 with fuzz 2 (offset -39 lines). Hunk #3 FAILED at 909. Hunk #4 FAILED at 1232. Hunk #5 FAILED at 1552. Hunk #6 succeeded at 6122 (offset -178 lines). 4 out of 6 hunks FAILED -- saving rejects to file src/gallium/drivers/r600/r600_shader.c.rej patching file src/gallium/drivers/r600/r600_state.c Hunk #1 succeeded at 2067 (offset 3 lines). Hunk #2 succeeded at 2119 (offset 3 lines). Hunk #3 succeeded at 2140 (offset 3 lines). Hunk #4 succeeded at 2326 (offset 3 lines). Hunk #5 succeeded at 2455 (offset 3 lines). Hunk #6 succeeded at 2467 (offset 3 lines). Hunk #7 succeeded at 2590 (offset 3 lines). Hunk #8 succeeded at 2611 (offset 3 lines). Hunk #9 succeeded at 2626 (offset 3 lines). Hunk #10 succeeded at 2805 (offset 3 lines). Hunk #11 succeeded at 2819 (offset 3 lines). Hunk #12 succeeded at 2829 (offset 3 lines). Hunk #13 succeeded at 3002 (offset 3 lines). Hunk #14 succeeded at 3452 (offset 3 lines). patching file src/gallium/drivers/r600/r600_state_common.c Hunk #1 FAILED at 1162. 1 out of 1 hunk FAILED -- saving rejects to file src/gallium/drivers/r600/r600_state_common.c.rej patching file src/gallium/drivers/r600/r600d.h Hunk #1 succeeded at 200 (offset -1 lines). Hunk #2 succeeded at 1837 (offset -1 lines). Hunk #3 succeeded at 2353 (offset -1 lines). Hunk #4 succeeded at 2462 (offset -1 lines). Hunk #5 succeeded at 2908 (offset -1 lines). patch unexpectedly ends in middle of line Hunk #6 succeeded at 3333 with fuzz 1 (offset -1 lines).
Comment