Switched to branch "2.6.25-rc1-mc3" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc1-mc3" Already on branch "2.6.25-rc1-mc3" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc1-mc3" Already on branch "2.6.25-rc1-mc3" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc1-mc3" Already on branch "2.6.25-rc1-mc3" From /pub/scm/linux/kernel/git/mchehab/v4l-dvb 19af355..96b5a46 master -> dvb Switched to branch "i2c" --15:45:17-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ Resolving khali.linux-fr.org... 62.4.17.15 Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html' 0K . 88.0M=0s 15:45:18 (88.0 MB/s) - `patches/i2c/index.html' saved [1107] Loading robots.txt; please ignore errors. --15:45:18-- http://khali.linux-fr.org/robots.txt Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 83 [text/plain] Saving to: `patches/i2c/robots.txt' 0K 100% 4.17M=0s 15:45:19 (4.17 MB/s) - `patches/i2c/robots.txt' saved [83/83] --15:45:19-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?N=D Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?N=D' 0K . 151M=0s 15:45:19 (151 MB/s) - `patches/i2c/index.html?N=D' saved [1107] --15:45:19-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?M=A Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?M=A' 0K . 62.1M=0s 15:45:19 (62.1 MB/s) - `patches/i2c/index.html?M=A' saved [1107] --15:45:19-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?S=A Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?S=A' 0K . 117M=0s 15:45:20 (117 MB/s) - `patches/i2c/index.html?S=A' saved [1107] --15:45:20-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?D=A Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?D=A' 0K . 117M=0s 15:45:20 (117 MB/s) - `patches/i2c/index.html?D=A' saved [1107] --15:45:20-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/i2c-algos-fix-typos.patch Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 2145 (2.1K) [text/plain] Saving to: `patches/i2c/i2c-algos-fix-typos.patch' 0K .. 100% 170M=0s 15:45:21 (170 MB/s) - `patches/i2c/i2c-algos-fix-typos.patch' saved [2145/2145] --15:45:21-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/i2c-pca-01-removing-trailing-whitespace.patch Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 5013 (4.9K) [text/plain] Saving to: `patches/i2c/i2c-pca-01-removing-trailing-whitespace.patch' 0K .... 100% 25.8K=0.2s 15:45:21 (25.8 KB/s) - `patches/i2c/i2c-pca-01-removing-trailing-whitespace.patch' saved [5013/5013] --15:45:21-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/series Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 72 [text/plain] Saving to: `patches/i2c/series' 0K 100% 9.81M=0s 15:45:22 (9.81 MB/s) - `patches/i2c/series' saved [72/72] --15:45:22-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?N=A Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?N=A' 0K . 117M=0s 15:45:22 (117 MB/s) - `patches/i2c/index.html?N=A' saved [1107] --15:45:22-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?M=D Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?M=D' 0K . 117M=0s 15:45:22 (117 MB/s) - `patches/i2c/index.html?M=D' saved [1107] --15:45:22-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?S=D Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?S=D' 0K . 132M=0s 15:45:23 (132 MB/s) - `patches/i2c/index.html?S=D' saved [1107] --15:45:23-- http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/?D=D Connecting to khali.linux-fr.org|62.4.17.15|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `patches/i2c/index.html?D=D' 0K . 132M=0s 15:45:23 (132 MB/s) - `patches/i2c/index.html?D=D' saved [1107] FINISHED --15:45:23-- Downloaded: 13 files, 17K in 0.2s (88.7 KB/s) Switched to branch "2.6.25-rc1-mc3" Already on branch "2.6.25-rc1-mc3" error: branch 'hid-upstream' not found. remote: Counting objects: 1  remote: Counting objects: 245, done. remote: Compressing objects: 0% (1/169)  remote: Compressing objects: 1% (2/169)  remote: Compressing objects: 2% (4/169)  remote: Compressing objects: 3% (6/169)  remote: Compressing objects: 4% (7/169)  remote: Compressing objects: 5% (9/169)  remote: Compressing objects: 6% (11/169)  remote: Compressing objects: 7% (12/169)  remote: Compressing objects: 8% (14/169)  remote: Compressing objects: 9% (16/169)  remote: Compressing objects: 10% (17/169)  remote: Compressing objects: 11% (19/169)  remote: Compressing objects: 12% (21/169)  remote: Compressing objects: 13% (22/169)  remote: Compressing objects: 14% (24/169)  remote: Compressing objects: 15% (26/169)  remote: Compressing objects: 16% (28/169)  remote: Compressing objects: 17% (29/169)  remote: Compressing objects: 18% (31/169)  remote: Compressing objects: 19% (33/169)  remote: Compressing objects: 20% (34/169)  remote: Compressing objects: 21% (36/169)  remote: Compressing objects: 22% (38/169)  remote: Compressing objects: 23% (39/169)  remote: Compressing objects: 24% (41/169)  remote: Compressing objects: 25% (43/169)  remote: Compressing objects: 26% (44/169)  remote: Compressing objects: 27% (46/169)  remote: Compressing objects: 28% (48/169)  remote: Compressing objects: 29% (50/169)  remote: Compressing objects: 30% (51/169)  remote: Compressing objects: 31% (53/169)  remote: Compressing objects: 32% (55/169)  remote: Compressing objects: 33% (56/169)  remote: Compressing objects: 34% (58/169)  remote: Compressing objects: 35% (60/169)  remote: Compressing objects: 36% (61/169)  remote: Compressing objects: 37% (63/169)  remote: Compressing objects: 38% (65/169)  remote: Compressing objects: 39% (66/169)  remote: Compressing objects: 40% (68/169)  remote: Compressing objects: 41% (70/169)  remote: Compressing objects: 42% (71/169)  remote: Compressing objects: 43% (73/169)  remote: Compressing objects: 44% (75/169)  remote: Compressing objects: 45% (77/169)  remote: Compressing objects: 46% (78/169)  remote: Compressing objects: 47% (80/169)  remote: Compressing objects: 48% (82/169)  remote: Compressing objects: 49% (83/169)  remote: Compressing objects: 50% (85/169)  remote: Compressing objects: 51% (87/169)  remote: Compressing objects: 52% (88/169)  remote: Compressing objects: 53% (90/169)  remote: Compressing objects: 54% (92/169)  remote: Compressing objects: 55% (93/169)  remote: Compressing objects: 56% (95/169)  remote: Compressing objects: 57% (97/169)  remote: Compressing objects: 58% (99/169)  remote: Compressing objects: 59% (100/169)  remote: Compressing objects: 60% (102/169)  remote: Compressing objects: 61% (104/169)  remote: Compressing objects: 62% (105/169)  remote: Compressing objects: 63% (107/169)  remote: Compressing objects: 64% (109/169)  remote: Compressing objects: 65% (110/169)  remote: Compressing objects: 66% (112/169)  remote: Compressing objects: 67% (114/169)  remote: Compressing objects: 68% (115/169)  remote: Compressing objects: 69% (117/169)  remote: Compressing objects: 70% (119/169)  remote: Compressing objects: 71% (120/169)  remote: Compressing objects: 72% (122/169)  remote: Compressing objects: 73% (124/169)  remote: Compressing objects: 74% (126/169)  remote: Compressing objects: 75% (127/169)  remote: Compressing objects: 76% (129/169)  remote: Compressing objects: 77% (131/169)  remote: Compressing objects: 78% (132/169)  remote: Compressing objects: 79% (134/169)  remote: Compressing objects: 80% (136/169)  remote: Compressing objects: 81% (137/169)  remote: Compressing objects: 82% (139/16Merge made by recursive. arch/x86/Kconfig | 4 +- arch/x86/kvm/mmu.c | 168 ++++++++++++++++++++++++++++++++++---------- arch/x86/kvm/mmu.h | 6 ++ arch/x86/kvm/paging_tmpl.h | 24 +++---- arch/x86/kvm/svm.c | 101 +++++++++++++++++++++++++-- arch/x86/kvm/vmx.c | 107 ++++++++++++++++++++++------ arch/x86/kvm/vmx.h | 10 ++- arch/x86/kvm/x86.c | 77 ++++++++++++-------- arch/x86/kvm/x86_emulate.c | 143 +++++++++++++++++++++---------------- include/asm-x86/kvm_host.h | 9 ++- include/linux/kvm.h | 4 +- include/linux/kvm_host.h | 2 + virt/kvm/kvm_main.c | 13 +++- 13 files changed, 486 insertions(+), 182 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/linux/rcupdate.h | 13 +- include/net/ax25.h | 2 + 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/ipv4/arp.c | 3 - net/ipv4/fib_trie.c | 99 ++- net/ipv4/ip_sockglue.c | 5 - 35 files changed, 5580 insertions(+), 1901 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 Deleted branch ocfs2. ## # 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-sci.c | 2 +- drivers/serial/sh-sci.h | 8 +- drivers/sh/maple/maple.c | 981 +++++++++++++++-------------- include/asm-sh/bugs.h | 2 +- include/asm-sh/cpu-sh4/freq.h | 4 +- include/asm-sh/cpu-sh5/cacheflush.h | 2 +- include/asm-sh/hp6xx.h | 28 +- include/asm-sh/io.h | 10 + include/asm-sh/io_trapped.h | 58 ++ include/asm-sh/ioctls.h | 4 + include/asm-sh/pgtable_64.h | 13 + include/asm-sh/processor.h | 2 +- include/asm-sh/r7780rp.h | 3 - include/asm-sh/rts7751r2d.h | 3 - include/asm-sh/system.h | 5 + include/asm-sh/system_32.h | 3 + include/asm-sh/termbits.h | 5 +- include/asm-sh/termios.h | 6 +- include/asm-sh/uaccess.h | 29 + include/asm-sh/uaccess_32.h | 24 +- include/asm-sh/uaccess_64.h | 19 - include/asm-sh/unistd_32.h | 6 +- include/asm-sh/unistd_64.h | 6 +- include/linux/maple.h | 100 ++-- 62 files changed, 2831 insertions(+), 1099 deletions(-) create mode 100644 arch/sh/boards/renesas/migor/Makefile create mode 100644 arch/sh/boards/renesas/migor/setup.c create mode 100644 arch/sh/configs/migor_defconfig delete mode 100644 arch/sh/kernel/cpu/irq/maskreg.c create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7366.c create mode 100644 arch/sh/kernel/io_trapped.c create mode 100644 include/asm-sh/io_trapped.h ## # git /pub/scm/linux/kernel/git/ericvh/v9fs for-linus v9fs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ericvh/v9fs v9fs-devel v9fs-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # gitfetch git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## ## # merge xfs resolve /home/jejb/xfs-fixup.diff ## Removed fs/xfs/Kbuild Auto-merged fs/xfs/Makefile-linux-2.6 CONFLICT (content): Merge conflict in fs/xfs/Makefile-linux-2.6 Auto-merged fs/xfs/linux-2.6/xfs_buf.c Auto-merged fs/xfs/linux-2.6/xfs_lrw.c rm 'fs/xfs/Makefile-linux-2.6' rm 'fs/xfs/Makefile-linux-2.6' rm 'fs/xfs/Makefile-linux-2.6' Created commit 0123611: Resolve Patch: /home/jejb/xfs-fixup.diff ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Auto-merged arch/xtensa/kernel/setup.c Merge made by recursive. arch/xtensa/kernel/asm-offsets.c | 1 - arch/xtensa/kernel/setup.c | 5 ----- arch/xtensa/mm/cache.c | 1 - arch/xtensa/platform-iss/network.c | 1 - 4 files changed, 0 insertions(+), 8 deletions(-) ## # git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # check ## Differences exist, continuing ## # label ## Created commit d9cf2a7: 2.6.25-rc1-mc3 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- ## 8/353) Receiving objects: 74% (262/353) Receiving objects: 75% (265/353) Receiving objects: 76% (269/353) Receiving objects: 77% (272/353) Receiving objects: 78% (276/353) Receiving objects: 79% (279/353) Receiving objects: 80% (283/353) Receiving objects: 81% (286/353) Receiving objects: 82% (290/353) Receiving objects: 83% (293/353) Receiving objects: 84% (297/353) Receiving objects: 85% (301/353) Receiving objects: 86% (304/353) Receiving objects: 87% (308/353) Receiving objects: 88% (311/353) Receiving objects: 89% (315/353) Receiving objects: 90% (318/353) Receiving objects: 91% (322/353) Receiving objects: 92% (325/353) Receiving objects: 93% (329/353) Receiving objects: 94% (332/353) Receiving objects: 95% (336/353) Receiving objects: 96% (339/353) Receiving objects: 97% (343/353) Receiving objects: 98% (346/353) Receiving objects: 99% (350/353) Receiving objects: 100% (353/353) Receiving objects: 100% (353/353), 93.98 KiB, done. Resolving deltas: 0% (1/288) Resolving deltas: 1% (5/288) Resolving deltas: 17% (51/288) Resolving deltas: 30% (88/288) Resolving deltas: 31% (90/288) Resolving deltas: 46% (134/288) Resolving deltas: 47% (137/288) Resolving deltas: 48% (140/288) Resolving deltas: 49% (142/288) Resolving deltas: 57% (166/288) Resolving deltas: 58% (168/288) Resolving deltas: 59% (170/288) Resolving deltas: 60% (174/288) Resolving deltas: 61% (176/288) Resolving deltas: 63% (183/288) Resolving deltas: 64% (187/288) Resolving deltas: 65% (188/288) Resolving deltas: 67% (193/288) Resolving deltas: 68% (198/288) Resolving deltas: 69% (200/288) Resolving deltas: 70% (202/288) Resolving deltas: 71% (205/288) Resolving deltas: 72% (209/288) Resolving deltas: 73% (211/288) Resolving deltas: 74% (214/288) Resolving deltas: 75% (216/288) Resolving deltas: 78% (226/288) Resolving deltas: 79% (230/288) Resolving deltas: 80% (232/288) Resolving deltas: 81% (234/288) Resolving deltas: 82% (237/288) Resolving deltas: 84% (242/288) Resolving deltas: 85% (245/288) Resolving deltas: 86% (248/288) Resolving deltas: 91% (263/288) Resolving deltas: 95% (276/288) Resolving deltas: 97% (280/288) Resolving deltas: 98% (284/288) Resolving deltas: 100% (288/288) Resolving deltas: 100% (288/288), completed with 55 local objects. From /pub/scm/linux/kernel/git/davem/net-2.6 * [new branch] master -> net From git://git.linux-nfs.org/pub/linux/nfs-2.6 2c15826..96b5a46 master -> nfs remote: Generating pack... remote: Done counting 17 objects. remote: Result has 11 objects. remote: Deltifying 11 objects. remote: 9% (1/11) done remote: 18% (2/11) done remote: 27% (3/11) done remote:  remote: 36% (4/11) done remote: 45% (5/11) done remote: 54% (6/11) done remote: 63% (7/11) done remote: 72% (8/11) done remote: 81% (9/11) done remote: 90% (10/11) done remote: 10remote: 0% (11/11) done remote: remote: Total 11 (delta 9), reused 9 (delta 7) From git://git390.osdl.marist.edu/pub/scm/linux-2.6 667984d..ba1b924 for-linus -> s390 remote: Counting objects: 1  remote: Counting objects: 358, done. remote: Compressing objects: 0% (1/108)  remote: Compressing objects: 1% (2/108)  remote: Compressing objects: 2% (3/108)  remote: Compressing objects: 3% (4/108)  remote: Compressing objects: 4% (5/108)  remote: Compressing objects: 5% (6/108)  remote: Compressing objects: 6% (7/108)  remote: Compressing objects: 7% (8/108)  remote: Compressing objects: 8% (9/108)  remote: Compressing objects: 9% (10/108)  remote: Compressing objects: 10% (11/108)  remote: Compressing objects: 11% (12/108)  remote: Compressing objects: 12% (13/108)  remote: Compressing objects: 13% (15/108)  remote: Compressing objects: 14% (16/108)  remote: Compressing objects: 15% (17/108)  remote: Compressing objects: 16% (18/108)  remote: Compressing objects: 17% (19/108)  remote: Compressing objects: 18% (20/108)  remote: Compressing objects: 19% (21/108)  remote: Compressing objects: 20% (22/108)  remote: Compressing objects: 21% (23/108)  remote: Compressing objects: 22% (24/108)  remote: Compressing objects: 23% (25/108)  remote: Compressing objects: 24% (26/108)  remote: Compressing objects: 25% (27/108)  remote: Compressing objects: 26% (29/108)  remote: Compressing objects: 27% (30/108)  remote: Compressing objects: 28% (31/108)  remote: Compressing objects: 29% (32/108)  remote: Compressing objects: 30% (33/108)  remote: Compressing objects: 31% (34/108)  remote: Compressing objects: 32% (35/108)  remote: Compressing objects: 33% (36/108)  remote: Compressing objects: 34% (37/108)  remote: Compressing objects: 35% (38/108)  remote: Compressing objects: 36% (39/108)  remote: Compressing objects: 37% (40/108)  remote: Compressing objects: 38% (42/108)  remote: Compressing objects: 39% (43/108)  remote: Compressing objects: 40% (44/108)  remote: Compressing objects: 41% (45/108)  remote: Compressing objects: 42% (46/108)  remote: Compressing objects: 43% (47/108)  remote: Compressing objects: 44% (48/108)  remote: Compressing objects: 45% (49/108)  remote: Compressing objects: 46% (50/108)  remote: Compressing objects: 47% (51/108)  remote: Compressing objects: 48% (52/108)  remote: Compressing objects: 49% (53/108)  remote: Compressing objects: 50% (54/108)  remote: Compressing objects: 51% (56/108)  remote: Compressing objects: 52% (57/108)  remote: Compressing objects: 53% (58/108)  remote: Compressing objects: 54% (59/108)  remote: Compressing objects: 55% (60/108)  remote: Compressing objects: 56% (61/108)  remote: Compressing objects: 57% (62/108)  remote: Compressing objects: 58% (63/108)  remote: Compressing objects: 59% (64/108)  remote: Compressing objects: 60% (65/108)  remote: Compressing objects: 61% (66/108)  remote: Compressing objects: 62% (67/108)  remote: Compressing objects: 63% (69/108)  remote: Compressing objects: 64% (70/108)  remote: Compressing objects: 65% (71/108)  remote: Compressing objects: 66% (72/108)  remote: Compressing objects: 67% (73/108)  remote: Compressing objects: 68% (74/108)  remote: Compressing objects: 69% (75/108)  remote: Compressing objects: 70% (76/108)  remote: Compressing objects: 71% (77/108)  remote: Compressing objects: 72% (78/108)  remote: Compressing objects: 73% (79/108)  remote: Compressing objects: 74% (80/108)  remote: Compressing objects: 75% (81/108)  remote: Compressing objects: 76% (83/108)  remote: Compressing objects: 77% (84/108)  remote: Compressing objects: 78% (85/108)  remote: Compressing objects: 79% (86/108)  remote: Compressing objects: 80% (87/108)  remote: Compressing objects: 81% (88/108)  remote: Compressing objects: 82% (89/108)  remote: Compressing objects: 83% (90/108)  remote: Compressing objects: 84% (91/108)  remote: Compressing objects: 85% (92/108)  remote: Compressing objects: 86% (93/108)  remote: Compressing objects: 87% (94/108)  remote: Compressing objects: 88% (96/108)  remote: Compressing objects: 89% (97/108)  remote: Compressing objects: 90% (98/108)  remote: Compressing objects: 91% (99/108)  remote: Compressing objects: 92% (100/108)  remote: Compressing objects: 93% (101/108)  remote: Compressing objects: 94% (102/108)  remote: Compressing objects: 95% (103/108)  remote: Compressing objects: 96% (104/108)  remote: Compressing objects: 97% (105/108)  remote: Compressing objects: 98% (106/108)  remote: Compressing objects: 99% (107/108)  remote: Compressing objects: 100% (108/108)  remote: Compressing objects: 100% (108/108), done. remote: Total 276 (delta 226), reused 203 (delta 168) Receiving objects: 0% (1/276) Receiving objects: 1% (3/276) Receiving objects: 2% (6/276) Receiving objects: 3% (9/276) Receiving objects: 4% (12/276) Receiving objects: 5% (14/276) Receiving objects: 6% (17/276) Receiving objects: 7% (20/276) Receiving objects: 8% (23/276) Receiving objects: 9% (25/276) Receiving objects: 10% (28/276) Receiving objects: 11% (31/276) Receiving objects: 12% (34/276) Receiving objects: 13% (36/276) Receiving objects: 14% (39/276) Receiving objects: 15% (42/276) Receiving objects: 16% (45/276) Receiving objects: 17% (47/276) Receiving objects: 18% (50/276) Receiving objects: 19% (53/276) Receiving objects: 20% (56/276) Receiving objects: 21% (58/276) Receiving objects: 22% (61/276) Receiving objects: 23% (64/276) Receiving objects: 24% (67/276) Receiving objects: 25% (69/276) Receiving objects: 26% (72/276) Receiving objects: 27% (75/276) Receiving objects: 28% (78/276) Receiving objects: 29% (81/276) Receiving objects: 30% (83/276) Receiving objects: 31% (86/276) Receiving objects: 32% (89/276) Receiving objects: 33% (92/276) Receiving objects: 34% (94/276) Receiving objects: 35% (97/276) Receiving objects: 36% (100/276) Receiving objects: 37% (103/276) Receiving objects: 38% (105/276) Receiving objects: 39% (108/276) Receiving objects: 40% (111/276) Receiving objects: 41% (114/276) Receiving objects: 42% (116/276) Receiving objects: 43% (119/276) Receiving objects: 44% (122/276) Receiving objects: 45% (125/276) Receiving objects: 46% (127/276) Receiving objects: 47% (130/276) Receiving objects: 48% (133/276) Receiving objects: 49% (136/276) Receiving objects: 50% (138/276) Receiving objects: 51% (141/276) Receiving objects: 52% (144/276) Receiving objects: 53% (147/276) Receiving objects: 54% (150/276) Receiving objects: 55% (152/276) Receiving objects: 56% (155/276) Receiving objects: 57% (158/276) Receiving objects: 58% (161/276) Receiving objects: 59% (163/276) Receiving objects: 60% (166/276) Receiving objects: 61% (169/276) Receiving objects: 62% (172/276) Receiving objects: 63% (174/276) Receiving objects: 64% (177/276) Receiving objects: 65% (180/276) Receiving objects: 66% (183/276) Receiving objects: 67% (185/276) Receiving objects: 68% (188/276) Receiving objects: 69% (191/276) Receiving objects: 70% (194/276) Receiving objects: 71% (196/276) Receiving objects: 72% (199/276) Receiving objects: 73% (202/276) Receiving objects: 74% (205/276) Receiving objects: 75% (207/276) Receiving objects: 76% (210/276) Receiving objects: 77% (213/276) Receiving objects: 78% (216/276) Receiving objects: 79% (219/276) Receiving objects: 80% (221/276) Receiving objects: 81% (224/276) Receiving objects: 82% (227/276) Receiving objects: 83% (230/276) Receiving objects: 84% (232/276) Receiving objects: 85% (235/276) Receiving objects: 86% (238/276) Receiving objects: 87% (241/276) Receiving objects: 88% (243/276) Receiving objects: 89% (246/276) Receiving objects: 90% (249/276) Receiving objects: 91% (252/276) Receiving objects: 92% (254/276) Receiving objects: 93% (257/276) Receiving objects: 94% (260/276) Receiving objects: 95% (263/276) Receiving objects: 96% (265/276) Receiving objects: 97% (268/276) Receiving objects: 98% (271/276) Receiving objects: 99% (274/276) Receiving objects: 100% (276/276) Receiving objects: 100% (276/276), 46.85 KiB, done. Resolving deltas: 10% (23/226) Resolving deltas: 11% (25/226) Resolving deltas: 12% (28/226) Resolving deltas: 27% (63/226) Resolving deltas: 38% (87/226) Resolving deltas: 40% (92/226) Resolving deltas: 41% (94/226) Resolving deltas: 42% (97/226) Resolving deltas: 43% (98/226) Resolving deltas: 44% (101/226) Resolving deltas: 45% (102/226) Resolving deltas: 46% (104/226) Resolving deltas: 47% (107/226) Resolving deltas: 48% (110/226) Resolving deltas: 49% (111/226) Resolving deltas: 50% (113/226) Resolving deltas: 55% (126/226) Resolving deltas: 56% (127/226) Resolving deltas: 58% (132/226) Resolving deltas: 59% (134/226) Resolving deltas: 60% (136/226) Resolving deltas: 61% (138/226) Resolving deltas: 62% (141/226) Resolving deltas: 63% (143/226) Resolving deltas: 64% (145/226) Resolving deltas: 65% (147/226) Resolving deltas: 66% (150/226) Resolving deltas: 67% (153/226) Resolving deltas: 69% (157/226) Resolving deltas: 70% (160/226) Resolving deltas: 71% (161/226) Resolving deltas: 72% (163/226) Resolving deltas: 73% (165/226) Resolving deltas: 74% (169/226) Resolving deltas: 75% (170/226) Resolving deltas: 76% (172/226) Resolving deltas: 77% (175/226) Resolving deltas: 83% (189/226) Resolving deltas: 88% (201/226) Resolving deltas: 89% (202/226) Resolving deltas: 90% (204/226) Resolving deltas: 91% (206/226) Resolving deltas: 92% (208/226) Resolving deltas: 93% (211/226) Resolving deltas: 94% (213/226) Resolving deltas: 95% (215/226) Resolving deltas: 96% (217/226) Resolving deltas: 97% (220/226) Resolving deltas: 98% (222/226) Resolving deltas: 99% (224/226) Resolving deltas: 100% (226/226) Resolving deltas: 100% (226/226), completed with 74 local objects. From /pub/scm/linux/kernel/git/lethal/sh-2.6 * [new branch] master -> sh Already on branch "2.6.25-rc1-mc3" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 58d5d0d..fac8493 master -> x86 From /pub/scm/linux/kernel/git/aegl/linux-2.6 551e4fb..10d0aa3 release -> ia64-release