|
楽天市場
Amazon 
|
[yasunari@giga linux-feroceon_2_1_10]$ zcat ../patch-2.6.13.gz | grep '^diff' | wc -l 5184 [yasunari@giga linux-feroceon_2_1_10]$がはっ。5184 もある。無事じゃすまなさそう。
[yasunari@giga linux-feroceon_2_1_10]$ zcat ../patch-2.6.13.gz | patch -N -p1
:
:
The next patch would create the file Documentation/filesystems/inotify.txt,
which already exists! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file Documentation/filesystems/inotify.txt.rej
:
:
patching file Makefile
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 282 (offset 1 line).
Hunk #4 succeeded at 793 (offset 1 line).
Hunk #6 succeeded at 1154 (offset 1 line).
1 out of 6 hunks FAILED -- saving rejects to file Makefile.rej
:
:
patching file arch/arm/Kconfig
Hunk #2 succeeded at 161 (offset 4 lines).
Hunk #3 succeeded at 198 with fuzz 1.
Hunk #4 succeeded at 321 (offset 98 lines).
Hunk #6 FAILED at 282.
Hunk #7 succeeded at 408 (offset 98 lines).
Hunk #8 succeeded at 389 with fuzz 2 (offset 41 lines).
Hunk #9 succeeded at 475 (offset 98 lines).
Hunk #10 succeeded at 557 (offset 41 lines).
Hunk #11 succeeded at 808 (offset 108 lines).
Hunk #12 succeeded at 775 (offset 41 lines).
Hunk #13 succeeded at 856 (offset 110 lines).
1 out of 13 hunks FAILED -- saving rejects to file arch/arm/Kconfig.rej
patching file arch/arm/Makefile
Hunk #1 FAILED at 56.
Hunk #2 succeeded at 116 (offset 25 lines).
1 out of 3 hunks FAILED -- saving rejects to file arch/arm/Makefile.rej
:
:
patching file arch/arm/kernel/calls.S
Hunk #1 FAILED at 327.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm/kernel/calls.S.rej
:
:
patching file arch/arm/kernel/entry-armv.S
Hunk #1 FAILED at 24.
Hunk #2 succeeded at 138 (offset 13 lines).
Hunk #4 succeeded at 213 (offset 13 lines).
Hunk #6 succeeded at 231 (offset 13 lines).
Hunk #8 succeeded at 294 (offset 13 lines).
Hunk #9 FAILED at 310.
Hunk #10 succeeded at 330 (offset 7 lines).
Hunk #11 succeeded at 352 (offset 13 lines).
Hunk #12 succeeded at 375 (offset 7 lines).
Hunk #13 succeeded at 405 (offset 13 lines).
Hunk #14 succeeded at 515 (offset 7 lines).
Hunk #15 succeeded at 546 (offset 13 lines).
Hunk #16 succeeded at 839 (offset 59 lines).
Hunk #17 succeeded at 835 (offset 13 lines).
Hunk #18 succeeded at 904 (offset 59 lines).
Hunk #19 succeeded at 881 (offset 13 lines).
Hunk #20 succeeded at 950 (offset 59 lines).
Hunk #21 succeeded at 958 (offset 13 lines).
Hunk #22 succeeded at 1025 (offset 59 lines).
2 out of 22 hunks FAILED -- saving rejects to file arch/arm/kernel/entry-armv.S.rej
:
:
patching file arch/arm/kernel/process.c
Hunk #1 FAILED at 32.
Hunk #2 succeeded at 87 (offset 1 line).
Hunk #3 succeeded at 155 with fuzz 1 (offset 24 lines).
Hunk #4 succeeded at 139 (offset 1 line).
Hunk #5 succeeded at 199 (offset 32 lines).
1 out of 5 hunks FAILED -- saving rejects to file arch/arm/kernel/process.c.rej
:
:
patching file arch/arm/kernel/signal.c
Hunk #2 FAILED at 36.
Hunk #3 FAILED at 501.
Hunk #4 succeeded at 704 (offset 7 lines).
2 out of 4 hunks FAILED -- saving rejects to file arch/arm/kernel/signal.c.rej
:
:
patching file arch/arm/lib/ashldi3.c
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm/lib/ashldi3.c.rej
:
:
patching file arch/arm/lib/lshrdi3.c
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm/lib/lshrdi3.c.rej
patching file arch/arm/lib/muldi3.c
Hunk #2 FAILED at 46.
1 out of 2 hunks FAILED -- saving rejects to file arch/arm/lib/muldi3.c.rej
patching file arch/arm/lib/ucmpdi2.c
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm/lib/ucmpdi2.c.rej
:
:
patching file arch/arm/mm/fault-armv.c
Hunk #4 FAILED at 132.
1 out of 4 hunks FAILED -- saving rejects to file arch/arm/mm/fault-armv.c.rej
patching file arch/arm/mm/fault.c
patching file arch/arm/mm/flush.c
Hunk #1 succeeded at 35 with fuzz 1 (offset -2 lines).
Hunk #2 FAILED at 45.
Hunk #3 FAILED at 106.
2 out of 3 hunks FAILED -- saving rejects to file arch/arm/mm/flush.c.rej
:
:
patching file arch/arm/nwfpe/fpa11.h
Hunk #3 FAILED at 91.
1 out of 3 hunks FAILED -- saving rejects to file arch/arm/nwfpe/fpa11.h.rej
:
:
patching file arch/arm/vfp/vfp.h
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file arch/arm/vfp/vfp.h.rej
patching file arch/arm/vfp/vfpdouble.c
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file arch/arm/vfp/vfpdouble.c.rej
patching file arch/arm/vfp/vfpmodule.c
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file arch/arm/vfp/vfpmodule.c.rej
patching file arch/arm/vfp/vfpsingle.c
Reversed (or previously applied) patch detected! Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file arch/arm/vfp/vfpsingle.c.rej
:
:
patching file drivers/mtd/maps/Makefile
Hunk #5 FAILED at 68.
1 out of 5 hunks FAILED -- saving rejects to file drivers/mtd/maps/Makefile.rej
:
:
patching file drivers/net/sk98lin/skge.c
Hunk #1 FAILED at 112.
Hunk #2 FAILED at 4213.
Hunk #3 FAILED at 4356.
Hunk #4 FAILED at 4369.
Hunk #5 FAILED at 4913.
Hunk #6 FAILED at 4962.
Hunk #7 FAILED at 5035.
Hunk #8 FAILED at 5133.
Hunk #9 FAILED at 5236.
9 out of 9 hunks FAILED -- saving rejects to file drivers/net/sk98lin/skge.c.rej
patching file drivers/net/sk98lin/skgeinit.c
Hunk #1 FAILED at 2016.
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sk98lin/skgeinit.c.rej
patching file drivers/net/sk98lin/skxmac2.c
Hunk #1 FAILED at 1065.
Hunk #2 FAILED at 1110.
Hunk #3 FAILED at 2126.
Hunk #4 FAILED at 2253.
4 out of 4 hunks FAILED -- saving rejects to file drivers/net/sk98lin/skxmac2.c.rej
:
:
patching file drivers/usb/gadget/ether.c
Hunk #1 FAILED at 84.
Hunk #2 FAILED at 141.
Hunk #3 FAILED at 310.
Hunk #4 FAILED at 329.
Hunk #5 FAILED at 396.
Hunk #6 FAILED at 540.
Hunk #7 FAILED at 848.
Hunk #8 FAILED at 945.
Hunk #9 FAILED at 984.
Hunk #10 FAILED at 1018.
Hunk #11 succeeded at 2012 with fuzz 2 (offset 986 lines).
Hunk #12 succeeded at 1397 with fuzz 2 (offset 352 lines).
Hunk #13 FAILED at 1424.
Hunk #14 FAILED at 1433.
Hunk #15 FAILED at 1447.
Hunk #16 FAILED at 1487.
Hunk #17 FAILED at 1500.
Hunk #18 FAILED at 1535.
Hunk #19 FAILED at 1552.
Hunk #20 FAILED at 1570.
Hunk #21 FAILED at 1631.
Hunk #22 FAILED at 1704.
Hunk #23 FAILED at 1736.
Hunk #24 FAILED at 1774.
Hunk #25 FAILED at 1791.
Hunk #26 FAILED at 1815.
Hunk #27 FAILED at 1830.
Hunk #28 FAILED at 1950.
Hunk #29 FAILED at 1969.
Hunk #30 FAILED at 2014.
Hunk #31 FAILED at 2076.
Hunk #32 FAILED at 2115.
Hunk #33 FAILED at 2131.
Hunk #34 FAILED at 2158.
Hunk #35 FAILED at 2244.
Hunk #36 FAILED at 2257.
Hunk #37 FAILED at 2289.
Hunk #38 FAILED at 2305.
Hunk #39 FAILED at 2344.
Hunk #40 FAILED at 2370.
Hunk #41 FAILED at 2386.
Hunk #42 FAILED at 2432.
Hunk #43 FAILED at 2474.
Hunk #44 FAILED at 2648.
Hunk #45 FAILED at 2662.
Hunk #46 FAILED at 2703.
Hunk #47 FAILED at 2776.
Hunk #48 FAILED at 2806.
Hunk #49 succeeded at 2061 (offset -415 lines).
Hunk #50 FAILED at 2077.
Hunk #51 succeeded at 2855 (offset 352 lines).
Hunk #52 FAILED at 2888.
48 out of 52 hunks FAILED -- saving rejects to file drivers/usb/gadget/ether.c.rej
patching file drivers/usb/gadget/file_storage.c
Hunk #3 FAILED at 342.
Hunk #4 FAILED at 361.
Hunk #5 succeeded at 378 with fuzz 2 (offset -3 lines).
Hunk #6 succeeded at 429 (offset 21 lines).
Hunk #7 succeeded at 858 (offset 39 lines).
Hunk #8 succeeded at 1299 (offset 22 lines).
Hunk #9 succeeded at 1352 (offset 39 lines).
Hunk #10 succeeded at 1367 (offset 22 lines).
Hunk #11 succeeded at 1398 (offset 39 lines).
Hunk #12 succeeded at 1396 (offset 22 lines).
Hunk #13 succeeded at 1421 (offset 39 lines).
Hunk #14 succeeded at 1423 (offset 22 lines).
Hunk #15 succeeded at 1448 (offset 39 lines).
Hunk #16 succeeded at 1456 (offset 22 lines).
Hunk #17 succeeded at 1501 (offset 39 lines).
Hunk #18 succeeded at 1503 (offset 22 lines).
Hunk #19 succeeded at 1534 (offset 39 lines).
Hunk #20 succeeded at 1573 (offset 22 lines).
Hunk #21 succeeded at 2844 (offset 187 lines).
Hunk #22 succeeded at 3789 (offset 239 lines).
Hunk #23 succeeded at 3772 (offset 187 lines).
Hunk #24 succeeded at 3848 (offset 239 lines).
2 out of 24 hunks FAILED -- saving rejects to file drivers/usb/gadget/file_storage.c.rej
:
:
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/usb/gadget/ndis.h.rej
:
:
patching file drivers/usb/gadget/rndis.c
Reversed (or previously applied) patch detected! Skipping patch.
39 out of 39 hunks ignored -- saving rejects to file drivers/usb/gadget/rndis.c.rej
patching file drivers/usb/gadget/rndis.h
Reversed (or previously applied) patch detected! Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file drivers/usb/gadget/rndis.h.rej
:
:
patching file drivers/usb/host/Makefile
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/host/Makefile.rej
:
:
patching file drivers/usb/host/ehci-q.c
Hunk #2 succeeded at 224 (offset 2 lines).
Hunk #3 FAILED at 430.
Hunk #4 succeeded at 664 (offset 6 lines).
Hunk #5 succeeded at 906 (offset 7 lines).
1 out of 5 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-q.c.rej
patching file drivers/usb/host/ehci-sched.c
Hunk #1 FAILED at 301.
Hunk #2 FAILED at 385.
Hunk #3 FAILED at 412.
Hunk #4 FAILED at 534.
Hunk #5 FAILED at 570.
Hunk #6 FAILED at 589.
Hunk #7 FAILED at 634.
Hunk #8 succeeded at 880 with fuzz 2 (offset 33 lines).
Hunk #9 FAILED at 927.
Hunk #10 FAILED at 953.
Hunk #11 FAILED at 1227.
Hunk #12 FAILED at 1244.
Hunk #13 FAILED at 1261.
Hunk #14 FAILED at 1290.
Hunk #15 FAILED at 1323.
Hunk #16 FAILED at 1330.
Hunk #17 succeeded at 1459 with fuzz 2 (offset 46 lines).
Hunk #18 FAILED at 1571.
Hunk #19 succeeded at 1822 with fuzz 2 (offset 48 lines).
Hunk #20 succeeded at 1873 with fuzz 2 (offset 48 lines).
16 out of 20 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-sched.c.rej
:
:
patching file drivers/usb/misc/usbtest.c
Hunk #1 succeeded at 524 (offset 63 lines).
Hunk #2 FAILED at 667.
Hunk #3 FAILED at 1305.
Hunk #4 FAILED at 1328.
Hunk #5 FAILED at 1342.
Hunk #6 FAILED at 1365.
Hunk #7 FAILED at 1596.
Hunk #8 FAILED at 1844.
Hunk #9 succeeded at 2011 with fuzz 1 (offset 63 lines).
Hunk #10 FAILED at 2220.
8 out of 10 hunks FAILED -- saving rejects to file drivers/usb/misc/usbtest.c.rej
:
:
patching file fs/Makefile
Hunk #1 FAILED at 10.
Hunk #2 succeeded at 34 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file fs/Makefile.rej
:
:
patching file fs/attr.c
Reversed (or previously applied) patch detected! Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file fs/attr.c.rej
:
:
patching file fs/compat.c
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file fs/compat.c.rej
:
:
patching file fs/file_table.c
Reversed (or previously applied) patch detected! Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file fs/file_table.c.rej
:
:
patching file fs/inode.c
Reversed (or previously applied) patch detected! Skipping patch.
20 out of 20 hunks ignored -- saving rejects to file fs/inode.c.rej
The next patch would create the file fs/inotify.c,
which already exists! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file fs/inotify.c.rej
:
:
patching file fs/jffs2/nodelist.c
Hunk #4 FAILED at 161.
1 out of 10 hunks FAILED -- saving rejects to file fs/jffs2/nodelist.c.rej
:
:
patching file fs/locks.c
Reversed (or previously applied) patch detected! Skipping patch.
12 out of 12 hunks ignored -- saving rejects to file fs/locks.c.rej
patching file fs/mbcache.c
patching file fs/namei.c
Reversed (or previously applied) patch detected! Skipping patch.
16 out of 16 hunks ignored -- saving rejects to file fs/namei.c.rej
:
:
patching file fs/nfsd/vfs.c
Hunk #1 FAILED at 45.
Hunk #6 FAILED at 860.
Hunk #7 FAILED at 916.
3 out of 8 hunks FAILED -- saving rejects to file fs/nfsd/vfs.c.rej
:
:
patching file fs/open.c
Reversed (or previously applied) patch detected! Skipping patch.
5 out of 5 hunks ignored -- saving rejects to file fs/open.c.rej
:
:
patching file fs/read_write.c
Reversed (or previously applied) patch detected! Skipping patch.
7 out of 7 hunks ignored -- saving rejects to file fs/read_write.c.rej
:
:
patching file fs/sysfs/file.c
Hunk #1 FAILED at 3.
Hunk #7 FAILED at 391.
Hunk #8 FAILED at 399.
Hunk #9 succeeded at 434 (offset -3 lines).
3 out of 9 hunks FAILED -- saving rejects to file fs/sysfs/file.c.rej
:
:
patching file fs/xattr.c
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file fs/xattr.c.rej
:
:
patching file include/linux/fs.h
Hunk #6 succeeded at 479 with fuzz 1 (offset 5 lines).
Hunk #8 succeeded at 686 (offset 5 lines).
Hunk #10 succeeded at 835 (offset 5 lines).
Hunk #12 succeeded at 998 (offset 5 lines).
Hunk #14 FAILED at 1400.
Hunk #15 succeeded at 1445 (offset 4 lines).
Hunk #17 succeeded at 1606 (offset 4 lines).
1 out of 18 hunks FAILED -- saving rejects to file include/linux/fs.h.rej
patching file include/linux/fsl_devices.h
The next patch would create the file include/linux/fsnotify.h,
which already exists! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/fsnotify.h.rej
:
:
patching file include/linux/init_task.h
The next patch would create the file include/linux/inotify.h,
which already exists! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/inotify.h.rej
:
:
patching file include/linux/sched.h
Hunk #5 FAILED at 410.
Hunk #6 succeeded at 473 (offset 4 lines).
Hunk #8 succeeded at 530 (offset 4 lines).
Hunk #10 succeeded at 588 (offset 4 lines).
Hunk #12 succeeded at 693 (offset 4 lines).
Hunk #14 succeeded at 773 (offset 4 lines).
Hunk #16 succeeded at 1123 (offset 4 lines).
1 out of 17 hunks FAILED -- saving rejects to file include/linux/sched.h.rej
:
:
patching file kernel/user.c
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file kernel/user.c.rej
:
:
[yasunari@giga linux-feroceon_2_1_10]$ find . -name '*.rej' -print | wc -l
51
[yasunari@giga linux-feroceon_2_1_10]$
というわけで 51 ファイルの reject 。思ったより少ない。patching file arch/arm/vfp/vfp.h Reversed (or previously applied) patch detected! Skipping patch. 2 out of 2 hunks ignored -- saving rejects to file arch/arm/vfp/vfp.h.rejこのパターンは、パッチをあてようとしたらもう既にあたっていた場合。
もう既にパッチがあたっているわけだから、無視して良い。
rej ファイルも要らない。
Documentation/filesystems/inotify.txt.rej arch/arm/vfp/vfp.h.rej arch/arm/vfp/vfpdouble.c.rej arch/arm/vfp/vfpmodule.c.rej arch/arm/vfp/vfpsingle.c.rej drivers/usb/gadget/ndis.h.rej drivers/usb/gadget/rndis.c.rej drivers/usb/gadget/rndis.h.rej fs/attr.c.rej fs/compat.c.rej fs/file_table.c.rej fs/inode.c.rej fs/inotify.c.rej fs/locks.c.rej fs/namei.c.rej fs/open.c.rej fs/read_write.c.rej fs/xattr.c.rej include/linux/fsnotify.h.rej include/linux/inotify.h.rej kernel/user.c.rejこれらを消すと、残りは
[yasunari@giga linux-feroceon_2_1_10]$ find . -name '*.rej' -print | wc -l
30
[yasunari@giga linux-feroceon_2_1_10]$
と３０本。さて、、、、
|
|
← カーネルパッチ |
ハックの記録 LinkStation／玄箱 をハックしよう |
→ カーネルパッチ（３）2.6.13 の reject 修正 |