Switched to branch "2.6.25-rc1-mc4" remote: Counting objects: 15, done. remote: Compressing objects: 10% (1/10) remote: Compressing objects: 20% (2/10) remote: Compressing objects: 30% (3/10) remote: Compressing objects: 40% (4/10) remote: Compressing objects: 50% (5/10) remote: Compressing objects: 60% (6/10) Merge made by recursive. drivers/message/fusion/mptbase.c | 54 ++++- drivers/message/fusion/mptbase.h | 1 + drivers/scsi/aacraid/aachba.c | 70 +++++-- drivers/scsi/aacraid/aacraid.h | 2 + drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aacraid/linit.c | 47 +++-- drivers/scsi/aacraid/rx.c | 5 +- drivers/scsi/aacraid/sa.c | 5 +- drivers/scsi/advansys.c Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc1-mc4" Already on branch "2.6.25-rc1-mc4" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc1-mc4" Already on branch "2.6.25-rc1-mc4" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc1-mc4" Already on branch "2.6.25-rc1-mc4" remote: Counting objects: 18, done. remote: Compressing objects: 8% (1/12) remote: Compressing objects: 16% (2/12) remote: Compressing objects: 25% (3/12) remote: Compressing objects: 33% (4/12) remote: Compressing objects: 41% (5/12) remote: Compressing objects: 50% (6/12) remote: Compressing objects: 58% (7/12) remote: Compressing objects: 66% (8/12) remote: Compressing objects: 75% (9/12) remote: Compressing objects: 83% (10/12) remote: Compressing objects: 91% (11/12) remote: Compressing objects: 100% (12/12) remote: Compressing objects: 100% (12/12), done. remote: Total 12 (delta 10), reused 0 (delta 0) From /pub/scm/linux/kernel/git/perex/alsa 4796586..505b8cd linus -> alsa remote: Counting objects: 48, done. remote: Compressing objects: 3% (1/32) remote: Compressing objects: 6% (2/32) remote: Compressing objects: 9% (3/32) remote: Compressing objects: 12% (4/32) remote: Compressing objects: 15% (5/32) remote: Compressing objects: 18% (6/32) remote: Compressing objects: 21% (7/32) remote: Compressing objects: 25% (8/32) remote: Compressing objects: 28% (9/32) remote: Compressing objects: 31% (10/32) remote: Compressing objects: 34% (11/32) remote: Compressing objects: 37% (12/32) remote: Compressing objects: 40% (13/32) remote: Compressing objects: 43% (14/32) remote: Compressing objects: 46% (15/32) remote: Compressing objects: 50% (16/32) remote: Compressing objects: 53% (17/32) remote: Compressing objects: 56% (18/32) remote: Compressing objects: 59% (19/32) remote: Compressing objects: 62% (20/32) remote: Compressing objects: 65% (21/32) remote: Compressing objects: 68% (22/32) remote: Compressing objects: 71% (23/32) remote: Compressing objects: 75% (24/32) remote: Compressing objects: 78% (25/32) remote: Compressing objects: 81% (26/32) remote: Compressing objects: 84% (27/32) remote: Compressing objects: 87% (28/32) remote: Compressing objects: 90% (29/32) remote: Compressing objects: 93% (30/32) remote: Compressing objects: 96% (31/32) remote: Compressing objects: 100% (32/32) remote: Compressing objects: 100% (32/32), done. remote: Total 32 (delta 28), reused 0 (delta 0) From /pub/scm/linux/kernel/git/sfrench/cifs-2.6 ad7a292..c1ce264 master -> cifs remote: Counting objects: 488, done. remote: Compressing objects: 0% (1/124) remote: Compressing objects: 1% (2/124) remote: Compressing objects: 2% (3/124) remote: Compressing objects: 3% (4/124) remote: Compressing objects: 4% (5/124) remote: Compressing objects: 5% (7/124) remote: Compressing objects: 6% (8/124) remote: Compressing objects: 7% (9/124) remote: Compressing objects: 8% (10/124) remote: Compressing objects: 9% (12/124) remote: Compressing objects: 10% (13/124) remote: Compressing objects: 11% (14/124) remote: Compressing objects: 12% (15/124) remote: Compressing objects: 13% (17/124) remote: Compressing objects: 14% (18/124) remote: Compressing objects: 15% (19/124) remote: Compressing objects: 16% (20/124) remote: Compressing objects: 17% (22/124) remote: Compressing objects: 18% (23/124) remote: Compressing objects: 19% (24/124) remote: Compressing objects: 20% (25/124) remote: Compressing objects: 21% (27/124) remote: Compressing objects: 22% (28/124) remote: Compressing objects: 23% (29/124) remote: Compressing objects: 24% (30/124) remote: Compressing objects: 25% (31/124) remote: Compressing objects: 26% (33/124) remote: Compressing objects: 27% (34/124) remote: Compressing objects: 28% (35/124) remote: Compressing objects: 29% (36/124) remote: Compressing objects: 30% (38/124) remote: Compressing objects: 31% (39/124) remote: Compressing objects: 32% (40/124) remote: Compressing objects: 33% (41/124) remote: Compressing objects: 34% (43/124) remote: Compressing objects: 35% (44/124) remote: Compressing objects: 36% (45/124) remote: Compressing objects: 37% (46/124) remote: Compressing objects: 38% (48/124) remote: Compressing objects: 39% (49/124) remote: Compressing objects: 40% (50/124) remote: Compressing objects: 41% (51/124) remote: Compressing objects: 42% (53/124) remote: Compressing objects: 43% (54/124) remote: Compressing objects: 44% (55/124) remote: Compressing objects: 45% (56/124) remote: Compressing objects: 46% (58/124) remote: Compressing objects: 47% (59/124) remote: Compressing objects: 48% (60/124) remote: Compressing objects: 49% (61/124) remote: Compressing objects: 50% (62/124) remote: Compressing objects: 51% (64/124) remote: Compressing objects: 52% (65/124) remote: Compressing objects: 53% (66/124) remote: Compressing objects: 54% (67/124) remote: Compressing objects: 55% (69/124) remote: Compressing objects: 56% (70/124) remote: Compressing objects: 57% (71/124) remote: Compressing objects: 58% (72/124) remote: Compressing objects: 59% (74/124) remote: Compressing objects: 60% (75/124) remote: Compressing objects: 61% (76/124) remote: Compressing objects: 62% (77/124) remote: Compressing objects: 63% (79/124) remote: Compressing objects: 64% (80/124) remote: Compressing objects: 65% (81/124) remote: Compressing objects: 66% (82/124) remote: Compressing objects: 67% (84/124) remote: Compressing objects: 68% (85/124) remote: Compressing objects: 69% (86/124) remote: Compressing objects: 70% (87/124) remote: Compressing objects: 71% (89/124) remote: Compressing objects: 72% (90/124) remote: Compressing objects: 73% (91/124) remote: Compressing objects: 74% (92/124) remote: Compressing objects: 75% (93/124) remote: Compressing objects: 76% (95/124) remote: Compressing objects: 77% (96/124) remote: Compressing objects: 78% (97/124) remote: Compressing objects: 79% (98/124) remote: Compressing objects: 80% (100/124) remote: Compressing objects: 81% (101/124) remote: Compressing objects: 82% (102/124) remote: Compressing objects: 83% (103/124) remote: Compressing objects: 84% (105/124) remote: Compressing objects: 85% (106/124) remote: Compressing objects: 86% (107/124) remote: Compressing objects: 87% (108/124) remote: Compressing objects: 88% (110/124) remote: Compressing objects: 89% (111/124) remote: Compressing objects: 90% (112/124) remote: Compressing objects: 91% (113/124) remote: Compressing objects: 92% (115/124) remote: Compressing objects: 93% (116/124) remote: Compressing objects: 94% (117/124) remote: Compressing objects: 95% (118/124) remote: Compressing objects: 96% (120/124) Merge made by recursive. Documentation/video4linux/CARDLIST.em28xx | 2 +- Documentation/video4linux/CARDLIST.saa7134 | 6 +- Documentation/video4linux/zr364xx.txt | 4 +- drivers/media/Kconfig | 16 +- drivers/media/common/Kconfig | 2 +- drivers/media/common/ir-keymaps.c | 46 ++ drivers/media/common/saa7146_vbi.c | 1 - drivers/media/common/saa7146_video.c | 2 - drivers/media/dvb/bt8xx/bt878.c | 23 +- drivers/media/dvb/dvb-usb/ttusb2.c | 1 + drivers/media/dvb/frontends/tda10086.c | 28 +- drivers/media/dvb/frontends/tda10086.h | 3 + drivers/media/dvb/frontends/tda18271-common.c | 2 +- drivers/media/dvb/ttpci/av7110_av.c | 15 +- drivers/media/dvb/ttpci/budget-av.c | 8 + drivers/media/dvb/ttpci/budget.c | 1 + drivers/media/radio/Kconfig | 4 +- drivers/media/radio/radio-sf16fmi.c | 1 + drivers/media/radio/radio-sf16fmr2.c | 5 +- drivers/media/radio/radio-si470x.c | 597 +++++++++++++++---------- drivers/media/video/Kconfig | 4 +- drivers/media/video/Makefile | 5 +- drivers/media/video/bt8xx/bttv-driver.c | 50 +-- drivers/media/video/bt8xx/bttv-vbi.c | 4 +- drivers/media/video/cx88/cx88-mpeg.c | 16 +- drivers/media/video/cx88/cx88.h | 1 + drivers/media/video/em28xx/em28xx-audio.c | 6 +- drivers/media/video/em28xx/em28xx-cards.c | 8 +- drivers/media/video/em28xx/em28xx-core.c | 111 +++-- drivers/media/video/em28xx/em28xx-video.c | 79 +++- drivers/media/video/em28xx/em28xx.h | 5 +- drivers/media/video/saa7134/saa7134-cards.c | 123 +++++- drivers/media/video/saa7134/saa7134-dvb.c | 28 +- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-input.c | 6 + drivers/media/video/saa7134/saa7134-video.c | 20 +- drivers/media/video/saa7134/saa7134.h | 2 + drivers/media/video/stk-sensor.c | 23 +- drivers/media/video/stk-webcam.c | 104 ++++- drivers/media/video/stk-webcam.h | 3 +- drivers/media/video/tcm825x.c | 2 +- drivers/media/video/tuner-core.c | 2 +- drivers/media/video/tvaudio.c | 10 +- drivers/media/video/tveeprom.c | 2 +- drivers/media/video/v4l2-common.c | 393 ++--------------- drivers/media/video/videobuf-core.c | 78 ++-- drivers/media/video/videobuf-dma-sg.c | 4 +- drivers/media/video/videobuf-vmalloc.c | 20 +- drivers/media/video/videodev.c | 444 ++++++++++++++++--- drivers/media/video/zr364xx.c | 2 + include/media/ir-common.h | 1 + include/media/v4l2-common.h | 2 - include/media/v4l2-dev.h | 2 + include/media/videobuf-core.h | 2 +- include/media/videobuf-vmalloc.h | 2 +- 55 files changed, 1430 insertions(+), 907 deletions(-) ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## i2c-algos-fix-typos.patch i2c-pca-01-removing-trailing-whitespace.patch ## # merge i2c ## Merge made by recursive. drivers/i2c/algos/Kconfig | 6 ++-- drivers/i2c/algos/i2c-algo-pca.c | 42 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 24 deletions(-) ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## BRANCH upstream not in tree /pub/scm/linux/kernel/git/jikos/hid.git, SKIPPING ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus jfs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/sam/kbuild.git master kbuild ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Merge made by recursive. arch/x86/Kconfig | 4 +- arch/x86/kvm/mmu.c | 190 ++++++++++++++++++++++++++++++++++---------- arch/x86/kvm/mmu.h | 6 ++ arch/x86/kvm/paging_tmpl.h | 35 ++++---- arch/x86/kvm/svm.c | 101 ++++++++++++++++++++++-- arch/x86/kvm/vmx.c | 114 +++++++++++++++++++++------ arch/x86/kvm/vmx.h | 10 ++- arch/x86/kvm/x86.c | 142 +++++++++++++++++++-------------- arch/x86/kvm/x86_emulate.c | 143 +++++++++++++++++++-------------- include/asm-x86/kvm_host.h | 9 ++- include/linux/kvm.h | 4 +- include/linux/kvm_host.h | 3 + virt/kvm/kvm_main.c | 18 +++- 13 files changed, 558 insertions(+), 221 deletions(-) ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Already up-to-date. ## # skip quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide ## SKIPPING: skip quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide ## # skip merge ide ## SKIPPING: skip merge ide ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband-for-2.6.25 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release acpi ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git for-linus arm-for-linus ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git master arm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus ieee1394-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master ieee1394 ## Auto-merged drivers/ieee1394/sbp2.c Merge made by recursive. drivers/firewire/fw-sbp2.c | 75 ++++++++++++++++++++++++++++++------------- drivers/ieee1394/sbp2.c | 7 +--- 2 files changed, 54 insertions(+), 28 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Already up-to-date. ## # git git://www.linux-mips.org/pub/scm/upstream-linus.git upstream mips ## Already up-to-date. ## # git git://www.linux-mips.org/pub/scm/upstream.git master mips-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-linus mmc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-andrew mmc-devel ## Already up-to-date. ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/davem/net-2.6.git master net ## Merge made by recursive. drivers/bluetooth/hci_ldisc.c | 1 + drivers/net/8139too.c | 2 +- drivers/net/Kconfig | 18 + drivers/net/Makefile | 3 +- drivers/net/cxgb3/l2t.c | 2 +- drivers/net/cxgb3/sge.c | 35 +- drivers/net/dm9000.c | 654 ++++++---- drivers/net/e1000/e1000_main.c | 18 +- drivers/net/forcedeth.c | 132 ++- drivers/net/ni52.c | 1142 ++++++++-------- drivers/net/ni52.h | 158 ++-- drivers/net/pcnet32.c | 48 +- drivers/net/phy/fixed.c | 4 +- drivers/net/ps3_gelic_net.c | 1215 ++++++++++------- drivers/net/ps3_gelic_net.h | 415 ++++-- drivers/net/ps3_gelic_wireless.c | 2753 ++++++++++++++++++++++++++++++++++++++ drivers/net/ps3_gelic_wireless.h | 329 +++++ drivers/net/r6040.c | 233 ++-- drivers/net/sis190.c | 3 +- drivers/s390/net/claw.h | 19 +- drivers/s390/net/lcs.c | 2 +- drivers/s390/net/lcs.h | 16 +- drivers/s390/net/netiucv.c | 29 +- include/linux/dm9000.h | 2 + include/net/ax25.h | 2 + include/net/ndisc.h | 1 - net/ax25/af_ax25.c | 12 +- net/ax25/ax25_dev.c | 2 +- net/ax25/ax25_ds_timer.c | 12 +- net/ax25/ax25_route.c | 28 +- net/ax25/ax25_timer.c | 60 +- net/core/neighbour.c | 12 +- net/core/skbuff.c | 3 +- net/ipv4/arp.c | 3 - net/ipv4/fib_trie.c | 99 ++- net/ipv4/ip_sockglue.c | 5 - net/ipv6/ip6_output.c | 6 +- net/ipv6/xfrm6_output.c | 2 +- 38 files changed, 5580 insertions(+), 1900 deletions(-) create mode 100644 drivers/net/ps3_gelic_wireless.c create mode 100644 drivers/net/ps3_gelic_wireless.h ## # git git://git.linux-nfs.org/pub/linux/nfs-2.6.git master nfs ## Already up-to-date. ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390 ## Merge made by recursive. arch/s390/Kconfig | 3 ++- arch/s390/kernel/process.c | 15 +++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) ## # git git://git.o-hand.com/linux-rpurdie-backlight for-linus backlight ## Already up-to-date. ## # git git://git.infradead.org/battery-2.6 master battery ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus ocfs2 ## BRANCH upstream-linus not in tree /pub/scm/linux/kernel/git/mfasheh/ocfs2.git, SKIPPING ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Merge made by recursive. Documentation/sched-rt-group.txt | 59 +++ include/linux/cgroup_subsys.h | 2 +- include/linux/hardirq.h | 10 + include/linux/init_task.h | 3 + include/linux/rcuclassic.h | 3 + include/linux/rcupreempt.h | 22 ++ include/linux/sched.h | 27 +- init/Kconfig | 23 +- kernel/rcupreempt.c | 224 +++++++++++- kernel/rtmutex.c | 5 +- kernel/sched.c | 771 +++++++++++++++++++++++++++++--------- kernel/sched_debug.c | 1 - kernel/sched_fair.c | 381 ++++++++++--------- kernel/sched_rt.c | 262 ++++++++++--- kernel/softirq.c | 1 + kernel/sysctl.c | 43 +-- kernel/time/tick-sched.c | 8 +- kernel/user.c | 78 ++++- 18 files changed, 1449 insertions(+), 474 deletions(-) create mode 100644 Documentation/sched-rt-group.txt ## # git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## Removed arch/sh/kernel/cpu/irq/maskreg.c Merge made by recursive. arch/sh/Kconfig | 19 + arch/sh/Kconfig.cpu | 4 +- arch/sh/Kconfig.debug | 3 +- arch/sh/Makefile | 1 + arch/sh/boards/renesas/migor/Makefile | 1 + arch/sh/boards/renesas/migor/setup.c | 61 ++ arch/sh/boards/renesas/r7780rp/setup.c | 47 +- arch/sh/boards/renesas/rts7751r2d/setup.c | 45 +- arch/sh/configs/migor_defconfig | 824 ++++++++++++++++++++++++ arch/sh/configs/rts7751r2d1_defconfig | 340 ++++++++--- arch/sh/configs/rts7751r2dplus_defconfig | 340 ++++++++--- arch/sh/drivers/dma/dma-api.c | 2 +- arch/sh/kernel/Makefile_32 | 1 + arch/sh/kernel/Makefile_64 | 1 + arch/sh/kernel/cpu/irq/Makefile | 1 - arch/sh/kernel/cpu/irq/intc-sh5.c | 27 +- arch/sh/kernel/cpu/irq/maskreg.c | 93 --- arch/sh/kernel/cpu/sh4/probe.c | 8 +- arch/sh/kernel/cpu/sh4a/Makefile | 2 + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 10 +- arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 177 ++++++ arch/sh/kernel/io.c | 8 +- arch/sh/kernel/io_generic.c | 24 +- arch/sh/kernel/io_trapped.c | 276 ++++++++ arch/sh/kernel/process_64.c | 9 +- arch/sh/kernel/ptrace_32.c | 4 +- arch/sh/kernel/setup.c | 2 +- arch/sh/kernel/syscalls_32.S | 4 +- arch/sh/kernel/syscalls_64.S | 4 +- arch/sh/kernel/time_32.c | 19 +- arch/sh/kernel/time_64.c | 31 +- arch/sh/kernel/timers/timer-cmt.c | 9 - arch/sh/kernel/timers/timer-mtu2.c | 3 - arch/sh/kernel/traps_32.c | 164 +++--- arch/sh/mm/cache-sh5.c | 8 +- arch/sh/mm/consistent.c | 30 +- arch/sh/mm/fault_32.c | 3 + arch/sh/tools/mach-types | 2 + drivers/serial/sh-scAlready on branch "2.6.25-rc1-mc4" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "doc" --07:18:11-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ Resolving oss.oracle.com... 141.146.12.120 Connecting to oss.oracle.com|141.146.12.120|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html' 0K . 100% 145M=0s 07:18:12 (145 MB/s) - `patches/doc/index.html' saved [1672/1672] Loading robots.txt; please ignore errors. --07:18:12-- http://oss.oracle.com/robots.txt Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 126 [text/plain] Saving to: `patches/doc/robots.txt' 0K 100% 20.0M=0s 07:18:12 (20.0 MB/s) - `patches/doc/robots.txt' saved [126/126] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=N;O=D Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=N;O=D' 0K . 100% 25.3M=0s 07:18:12 (25.3 MB/s) - `patches/doc/index.html?C=N;O=D' saved [1672/1672] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=M;O=A Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=M;O=A' 0K . 100% 8.22M=0s 07:18:12 (8.22 MB/s) - `patches/doc/index.html?C=M;O=A' saved [1672/1672] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=S;O=A Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=S;O=A' 0K . 100% 5.09M=0s 07:18:12 (5.09 MB/s) - `patches/doc/index.html?C=S;O=A' saved [1672/1672] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=D;O=A Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=D;O=A' 0K . 100% 228M=0s 07:18:12 (228 MB/s) - `patches/doc/index.html?C=D;O=A' saved [1672/1672] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/docbook-audit-prms.patch Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 867 [text/plain] Saving to: `patches/doc/docbook-audit-prms.patch' 0K 100% 103M=0s 07:18:12 (103 MB/s) - `patches/doc/docbook-audit-prms.patch' saved [867/867] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/docbook-blk-prms.patch Reusing edocbook-audit-prms.patch docbook-blk-prms.patch docbook-cpu-mtrr-prm.patch docbook-drv-base.patch docbook-pci-acpi-prm.patch docbook-skbuffh-prm.patch docbook-sunrpc-filename.patch ## # merge doc ## Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 10 +++++++++- arch/x86/kernel/cpu/mtrr/main.c | 1 + block/blk-core.c | 2 ++ block/blk-settings.c | 1 - drivers/base/driver.c | 3 +++ drivers/base/power/main.c | 1 + drivers/pci/pci-acpi.c | 1 + include/linux/skbuff.h | 2 ++ include/net/sock.h | 1 + kernel/audit.c | 4 ++-- net/sunrpc/clnt.c | 10 +++++----- net/sunrpc/rpc_pipe.c | 3 ++- net/sunrpc/xprt.c | 2 +- 13 files changed, 30 insertions(+), 11 deletions(-) ## # check ## Differences exist, continuing ## # label ## Created commit fcde541: 2.6.25-rc1-mc4 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ## :12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/docbook-pci-acpi-prm.patch Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 665 [text/plain] Saving to: `patches/doc/docbook-pci-acpi-prm.patch' 0K 100% 79.3M=0s 07:18:12 (79.3 MB/s) - `patches/doc/docbook-pci-acpi-prm.patch' saved [665/665] --07:18:12-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/docbook-skbuffh-prm.patch Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1356 (1.3K) [text/plain] Saving to: `patches/doc/docbook-skbuffh-prm.patch' 0K . 100% 32.3M=0s 07:18:13 (32.3 MB/s) - `patches/doc/docbook-skbuffh-prm.patch' saved [1356/1356] --07:18:13-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/docbook-sunrpc-filename.patch Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 3724 (3.6K) [text/plain] Saving to: `patches/doc/docbook-sunrpc-filename.patch' 0K ... 100% 41.5K=0.09s 07:18:13 (41.5 KB/s) - `patches/doc/docbook-sunrpc-filename.patch' saved [3724/3724] --07:18:13-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/series Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 181 [text/plain] Saving to: `patches/doc/series' 0K 100% 34.5M=0s 07:18:13 (34.5 MB/s) - `patches/doc/series' saved [181/181] --07:18:13-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=N;O=A Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=N;O=A' 0K . 100% 228M=0s 07:18:13 (228 MB/s) - `patches/doc/index.html?C=N;O=A' saved [1672/1672] --07:18:13-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=M;O=D Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=M;O=D' 0K . 100% 266M=0s 07:18:13 (266 MB/s) - `patches/doc/index.html?C=M;O=D' saved [1672/1672] --07:18:13-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=S;O=D Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=S;O=D' 0K . 100% 266M=0s 07:18:13 (266 MB/s) - `patches/doc/index.html?C=S;O=D' saved [1672/1672] --07:18:13-- http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/?C=D;O=D Reusing existing connection to oss.oracle.com:80. HTTP request sent, awaiting response... 200 OK Length: 1672 (1.6K) [text/html] Saving to: `patches/doc/index.html?C=D;O=D' 0K . 100% 266M=0s 07:18:13 (266 MB/s) - `patches/doc/index.html?C=D;O=D' saved [1672/1672] FINISHED --07:18:13-- Downloaded: 18 files, 25K in 0.09s (287 KB/s) Switched to branch "2.6.25-rc1-mc4" Already on branch "2.6.25-rc1-mc4"