patch -p1 --dry-run --verbose Outputs

patching.out (text/plain), 5.38 KB, created by Sebastian Stammler on 2006-09-25 16:18:44 UTC

Output of 'patch -p1 --dry-run --verbose' from Daniel's patch:

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From: Francois Romieu <[e-mail]>
|Date: Wed, 26 Jul 2006 21:14:13 +0000 (+0200)
|Subject: r8169: sync with vendor's driver
|X-Git-Tag: v2.6.18-rc3
|X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=bcf0bf90cd9e9242b66e0563b6a8c8db2e4c262c
|
|r8169: sync with vendor's driver
|
|- add several PCI ID for the PCI-E adapters ;
|- new identification strings ;
|- the RTL_GIGA_MAC_VER_ defines have been renamed to closely match the
|  out-of-tree driver. It makes the comparison less hairy ;
|- various magic ;
|- the PCI region for the device with PCI ID 0x8136 is guessed.
|  Explanation: the in-kernel Linux driver is written to allow MM register
|  accesses and avoid the IO tax. The relevant BAR register was found at
|  base address 1 for the plain-old PCI 8169. User reported lspci show that
|  it is found at base address 2 for the new Gigabit PCI-E 816{8/9}.
|  Typically:
|  01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd.: Unknown device 8168 (rev 01)
|          Subsystem: Unknown device 1631:e015
|          Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B-
|          Status: Cap+ 66Mhz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR-
|          Latency: 0, cache line size 20
|          Interrupt: pin A routed to IRQ 16
|          Region 0: I/O ports at b800 [size=256]
|          Region 2: Memory at ff7ff000 (64-bit, non-prefetchable) [size=4K]
|          ^^^^^^^^
|  So far I have not received any lspci report for the 0x8136 and
|  Realtek's driver do not help: be it under BSD or Linux, their r1000 driver
|  include a USE_IO_SPACE #define but the bar address is always hardcoded
|  to 1 in the MM case. :o/
|- the 8168 has been reported to require an extra alignment for its receive
|  buffers. The status of the 8167 and 8136 is not known in this regard.
|
|Signed-off-by: Francois Romieu <[e-mail]>
|---
|
|--- a/drivers/net/r8169.c
|+++ b/drivers/net/r8169.c
--------------------------
Patching file drivers/net/r8169.c using Plan A...
Hunk #1 succeeded at 150.
Hunk #2 succeeded at 171.
Hunk #3 succeeded at 179.
Hunk #4 succeeded at 375 (offset -1 lines).
Hunk #5 succeeded at 463 (offset -1 lines).
Hunk #6 succeeded at 780 with fuzz 1 (offset -1 lines).
Hunk #7 succeeded at 1189 (offset -8 lines).
Hunk #8 succeeded at 1210 (offset -8 lines).
Hunk #9 succeeded at 1295 (offset -8 lines).
Hunk #10 succeeded at 1305 (offset -8 lines).
Hunk #11 succeeded at 1344 (offset -8 lines).
Hunk #12 succeeded at 1380 (offset -8 lines).
Hunk #13 succeeded at 1392 (offset -8 lines).
Hunk #14 FAILED at 1478.
Hunk #15 FAILED at 1501.
Hunk #16 FAILED at 1553.
Hunk #17 FAILED at 1600.
Hunk #18 succeeded at 1672 (offset -36 lines).
Hunk #19 succeeded at 1682 with fuzz 2 (offset -34 lines).
Hunk #20 succeeded at 1689 (offset -34 lines).
Hunk #21 succeeded at 1816 (offset -25 lines).
Hunk #22 succeeded at 1829 (offset -25 lines).
Hunk #23 succeeded at 1865 (offset -25 lines).
Hunk #24 succeeded at 1887 (offset -25 lines).
Hunk #25 succeeded at 1969 (offset -27 lines).
Hunk #26 succeeded at 2019 (offset -27 lines).
Hunk #27 succeeded at 2432 (offset -27 lines).
Hunk #28 succeeded at 2508 (offset -31 lines).
Hunk #29 succeeded at 2777 (offset -31 lines).
4 out of 29 hunks FAILED -- saving rejects to file drivers/net/r8169.c.rej
done

Output of 'patch -p1 --dry-run --verbose' from my mm patch:

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux-2.6.18-rc6/drivers/net/r8169.c	2006-09-04 13:50:52.000000000 -0700
|+++ devel/drivers/net/r8169.c	2006-09-08 00:48:44.000000000 -0700
--------------------------
Patching file drivers/net/r8169.c using Plan A...
Hunk #1 succeeded at 6.
Hunk #2 succeeded at 81.
Hunk #3 succeeded at 150.
Hunk #4 succeeded at 171.
Hunk #5 succeeded at 179.
Hunk #6 succeeded at 286.
Hunk #7 succeeded at 356.
Hunk #8 succeeded at 439.
Hunk #9 succeeded at 495.
Hunk #10 succeeded at 505.
Hunk #11 succeeded at 549.
Hunk #12 succeeded at 571.
Hunk #13 succeeded at 610.
Hunk #14 succeeded at 652.
Hunk #15 succeeded at 747.
Hunk #16 succeeded at 809.
Hunk #17 succeeded at 824.
Hunk #18 succeeded at 957.
Hunk #19 succeeded at 982.
Hunk #20 succeeded at 1007.
Hunk #21 succeeded at 1097.
Hunk #22 succeeded at 1157.
Hunk #23 succeeded at 1166.
Hunk #24 succeeded at 1187.
Hunk #25 succeeded at 1204.
Hunk #26 succeeded at 1272.
Hunk #27 succeeded at 1282.
Hunk #28 succeeded at 1321.
Hunk #29 succeeded at 1357.
Hunk #30 succeeded at 1369.
Hunk #31 succeeded at 1397.
Hunk #32 succeeded at 1441.
Hunk #33 succeeded at 1534.
Hunk #34 succeeded at 1592.
Hunk #35 succeeded at 1618.
Hunk #36 succeeded at 1639.
Hunk #37 succeeded at 1651.
Hunk #38 succeeded at 1658.
Hunk #39 succeeded at 1681.
Hunk #40 succeeded at 1705.
Hunk #41 succeeded at 1720.
Hunk #42 succeeded at 1838.
Hunk #43 succeeded at 1884.
Hunk #44 succeeded at 1908.
Hunk #45 succeeded at 1924.
Hunk #46 succeeded at 1994.
Hunk #47 succeeded at 2038.
Hunk #48 succeeded at 2275.
Hunk #49 succeeded at 2340.
Hunk #50 succeeded at 2457.
Hunk #51 succeeded at 2513.
Hunk #52 succeeded at 2537.
Hunk #53 succeeded at 2633.
Hunk #54 succeeded at 2806.
Hunk #55 succeeded at 2840.
Hunk #56 succeeded at 2908.
done