Patching files that already exist/ don't exist
Posted: Wed Oct 10, 2012 10:09 pm
So I downloaded the source from kernel.org and the test patch for 3.6.1.
patch -p1 < /usr/src/linux/grsecurity-2.9.1-3.6.1-201210102005.patch
I'm getting output like this:
patching file Documentation/devicetree/bindings/gpio/gpio_i2c.txt
The next patch would delete the file Documentation/devicetree/bindings/gpio/gpio_nvidia.txt,
which does not exist! Assume -R? [n] y
patching file Documentation/devices.txt
Reversed (or previously applied) patch detected! Assume -R? [n] y
The next patch would create the file Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt,
which already exists! Assume -R? [n] y
patching file Documentation/feature-removal-schedule.txt
Hunk #1 succeeded at 21 (offset 8 lines).
Hunk #2 FAILED at 78.
Hunk #3 FAILED at 257.
Hunk #4 FAILED at 422.
Hunk #5 succeeded at 440 (offset -17 lines).
Hunk #6 FAILED at 544.
Hunk #7 succeeded at 592 (offset -18 lines).
Hunk #8 FAILED at 625.
Hunk #9 succeeded at 665 with fuzz 1 (offset 25 lines).
5 out of 9 hunks FAILED -- saving rejects to file Documentation/feature-removal-schedule.txt.rej
patch -p1 < /usr/src/linux/grsecurity-2.9.1-3.6.1-201210102005.patch
I'm getting output like this:
patching file Documentation/devicetree/bindings/gpio/gpio_i2c.txt
The next patch would delete the file Documentation/devicetree/bindings/gpio/gpio_nvidia.txt,
which does not exist! Assume -R? [n] y
patching file Documentation/devices.txt
Reversed (or previously applied) patch detected! Assume -R? [n] y
The next patch would create the file Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt,
which already exists! Assume -R? [n] y
patching file Documentation/feature-removal-schedule.txt
Hunk #1 succeeded at 21 (offset 8 lines).
Hunk #2 FAILED at 78.
Hunk #3 FAILED at 257.
Hunk #4 FAILED at 422.
Hunk #5 succeeded at 440 (offset -17 lines).
Hunk #6 FAILED at 544.
Hunk #7 succeeded at 592 (offset -18 lines).
Hunk #8 FAILED at 625.
Hunk #9 succeeded at 665 with fuzz 1 (offset 25 lines).
5 out of 9 hunks FAILED -- saving rejects to file Documentation/feature-removal-schedule.txt.rej