Switched to branch "2.6.24-mc14" remote: Counting objects: 232, done. remote: Compressing objects: 0% (1/196) remote: Compressing objects: 1% (2/196) remote: Compressing objects: 2% (4/196) remote: Compressing objects: 3% (6/196) remote: Compressing objects: 4% (8/196) remote: Compressing objects: 5% (10/196) remote: Compressing objects: 6% (12/196) remotRemoved drivers/scsi/NCR53C9x.c Removed drivers/scsi/NCR53C9x.h Removed drivers/scsi/blz1230.c Removed drivers/scsi/blz2060.c Removed drivers/scsi/cyberstorm.c Removed drivers/scsi/cyberstormII.c Removed drivers/scsi/dec_esp.c Removed drivers/scsi/fastlane.c Removed drivers/scsi/mac_esp.c Removed drivers/scsi/mca_53c9x.c Removed drivers/scsi/oktagon_esp.c Removed drivers/scsi/oktagon_io.S Merge made by recursive. Documentation/DocBook/scsi.tmpl | 2 +- Documentation/scsi/scsi_mid_low_api.txt | 2 +- drivers/scsi/Kconfig | 83 +- drivers/scsi/Makefile | 11 +- drivers/scsi/NCR53C9x.c | 3654 ------------------------------- drivers/scsi/NCR53C9x.h | 668 ------ drivers/scsi/aacraid/commctrl.c | 26 +- drivers/scsi/arm/acornscsi.c | 14 +- drivers/scsi/arm/scsi.h | 87 +- drivers/scsi/blz1230.c | 353 --- drivers/scsi/blz2060.c | 306 --- drivers/scsi/cyberstorm.c | 377 ---- drivers/scsi/cyberstormII.c | 314 --- drivers/scsi/dec_esp.c | 687 ------ drivers/scsi/fastlane.c | 421 ---- drivers/scsi/iscsi_tcp.c | 57 +- drivers/scsi/libiscsi.c | 137 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/mac_esp.c | 751 ------- drivers/scsi/mca_53c9x.c | 520 ----- drivers/scsi/oktagon_esp.c | 606 ----- drivers/scsi/oktagon_io.S | 194 -- drivers/scsi/ps3rom.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 24 +- drivers/scsi/qla2xxx/qla_def.h | 2 - drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 87 +- drivers/scsi/qla2xxx/qla_inline.h | 7 + drivers/scsi/qla2xxx/qla_isr.c | 27 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 404 ++--- drivers/scsi/qla2xxx/qla_sup.c | 36 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qla4xxx/ql4_init.c | 1 + drivers/scsi/qla4xxx/ql4_os.c | 75 +- drivers/scsi/scsi.c | 5 +- drivers/scsi/scsi_transport_iscsi.c | 238 ++- drivers/scsi/sd.c | 34 +- drivers/scsi/sun3x_esp.c | 546 ++--- drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- include/scsi/iscsi_proto.h | 4 +- include/scsi/libiscsi.h | 30 +- include/scsi/scsi.h | 14 + include/scsi/scsi_transport_iscsi.h | 43 +- 44 files changed, 966 insertions(+), 9892 deletions(-) delete mode 100644 drivers/scsi/NCR53C9x.c delete mode 100644 drivers/scsi/NCR53C9x.h delete mode 100644 drivers/scsi/blz1230.c delete mode 100644 drivers/scsi/blz2060.c delete mode 100644 drivers/scsi/cyberstorm.c delete mode 100644 drivers/scsi/cyberstormII.c delete mode 100644 drivers/scsi/dec_esp.c delete mode 100644 drivers/scsi/fastlane.c delete mode 100644 drivers/scsi/mac_esp.c delete mode 100644 drivers/scsi/mca_53c9x.c delete mode 100644 drivers/scsi/oktagon_esp.c delete mode 100644 drivers/scsi/oktagon_io.S ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-mm agp-mm ## Auto-merged drivers/char/agp/backend.c Auto-merged drivers/char/agp/generic.c Auto-merged drivers/char/agp/intel-agp.c Merge made by recursive. arch/x86/pci/i386.c | 2 +- drivers/char/agp/agp.h | 6 +- drivers/char/agp/amd-k7-agp.c | 4 - drivers/char/agp/backend.c | 2 +- drivers/char/agp/compat_ioctl.c | 4 + drivers/char/agp/compat_ioctl.h | 2 + drivers/char/agp/frontend.c | 13 ++- drivers/char/agp/generic.c | 7 + drivers/char/agp/intel-agp.c | 307 +++++++++++++++++++++++++++++++-------- include/linux/agp_backend.h | 1 + include/linux/agpgart.h | 1 + 11 files changed, 278 insertions(+), 71 deletions(-) ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Merge made by recursive. sound/pci/oxygen/oxygen_lib.c | 10 +++++----- sound/pci/oxygen/oxygen_pcm.c | 2 +- sound/usb/caiaq/caiaq-control.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) ## # gitfetch /pub/scm/linux/kernel/git/viro/audit-current.git mm.b43 audit-mm ## ## # merge audit-mm resolve /home/jejb/viro-audit-fixup.diff ## MERGE audit-mm not in tree, SKIPPING ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Merge made by recursive. drivers/char/keyboard.c | 3 ++- include/asm-avr32/page.h | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merged drivers/cpufreq/cpufreq.c Merge made by recursive. arch/x86/kernel/cpu/cpufreq/Kconfig | 4 +- arch/x86/kernel/cpu/cpufreq/e_powersaver.c | 33 ++++++++++++++++++++--- arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 4 +- arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 5 +-- arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 2 +- drivers/cpufreq/Kconfig | 3 -- drivers/cpufreq/cpufreq.c | 33 +++++++++++++++++++++-- drivers/cpufreq/cpufreq_userspace.c | 40 +++++----------------------- drivers/cpufreq/freq_table.c | 2 +- include/linux/cpufreq.h | 4 +++ 11 files changed, 79 insertions(+), 53 deletions(-) ## # skip quilt /pub/linux/kernel/people/agk/patches/2.6/editing/. dm ## SKIPPING: skip quilt /pub/linux/kernel/people/agk/patches/2.6/editing/. dm ## # skip merge dm ## SKIPPING: skip merge dm ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master dvb ## Already up-to-date. ## # skip quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## SKIPPING: skip quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## # skip merge i2c ## SKIPPING: skip merge i2c ## # 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 ## Auto-merged arch/arm/mach-pxa/tosa.c Auto-merged drivers/char/keyboard.c Auto-merged drivers/input/touchscreen/ads7846.c Auto-merged drivers/input/touchscreen/ucb1400_ts.c Auto-merged include/linux/input.h Merge made by recursive. Documentation/input/input-programming.txt | 2 +- arch/arm/mach-pxa/tosa.c | 43 +++ drivers/char/keyboard.c | 5 +- drivers/input/Kconfig | 12 + drivers/input/Makefile | 1 + drivers/input/apm-power.c | 131 +++++++ drivers/input/evdev.c | 6 +- drivers/input/gameport/gameport.c | 1 - drivers/input/input-polldev.c | 18 +- drivers/input/input.c | 85 ++++- drivers/input/joystick/amijoy.c | 1 - drivers/input/joystick/analog.c | 1 - drivers/input/joystick/db9.c | 1 - drivers/input/joystick/gamecon.c | 1 - drivers/input/joystick/iforce/iforce-main.c | 17 +- drivers/input/joystick/turbografx.c | 1 - drivers/input/joystick/xpad.c | 1 - drivers/input/keyboard/Kconfig | 21 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/atkbd.c | 91 ++++- drivers/input/keyboard/bf54x-keys.c | 1 - drivers/input/keyboard/jornada720_kbd.c | 1 - drivers/input/keyboard/lkkbd.c | 1 - drivers/input/keyboard/tosakbd.c | 415 +++++++++++++++++++++ drivers/input/misc/Kconfig | 14 + drivers/input/misc/Makefile | 1 + drivers/input/misc/apanel.c | 378 +++++++++++++++++++ drivers/input/misc/ati_remote.c | 1 - drivers/input/misc/atlas_btns.c | 39 ++- drivers/input/misc/cobalt_btns.c | 73 ++-- drivers/input/misc/keyspan_remote.c | 119 ++++--- drivers/input/mouse/inport.c | 1 - drivers/input/mouse/logibm.c | 1 - drivers/input/mouse/psmouse-base.c | 1 - drivers/input/mouse/trackpoint.c | 1 - drivers/input/mousedev.c | 3 +- drivers/input/serio/i8042-x86ia64io.h | 67 ++++- drivers/input/serio/i8042.c | 24 ++- drivers/input/serio/libps2.c | 1 - drivers/input/touchscreen/ads7846.c | 8 +- drivers/input/touchscreen/mk712.c | 1 - drivers/input/touchscreen/ucb1400_ts.c | 1 - drivers/media/video/usbvideo/konicawc.c | 2 - drivers/media/video/usbvideo/quickcam_messenger.c | 2 - include/asm-arm/arch-pxa/tosa.h | 30 ++ include/linux/input.h | 7 +- 46 files changed, 1439 insertions(+), 194 deletions(-) create mode 100644 drivers/input/apm-power.c create mode 100644 drivers/input/keyboard/tosakbd.c create mode 100644 drivers/input/misc/apanel.c ## # 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 ## Removed arch/arm/Kconfig.instrumentation Removed kernel/Kconfig.instrumentation Merge made by recursive. arch/Kconfig | 31 +++++++++++++++++++ arch/alpha/Kconfig | 3 +- arch/arm/Kconfig | 21 +++++++++++- arch/arm/Kconfig.instrumentation | 62 -------------------------------------- arch/avr32/Kconfig | 5 +-- arch/blackfin/Kconfig | 3 +- arch/cris/Kconfig | 2 - arch/frv/Kconfig | 2 - arch/h8300/Kconfig | 2 - arch/ia64/Kconfig | 4 +- arch/m32r/Kconfig | 3 +- arch/m68k/Kconfig | 2 - arch/m68knommu/Kconfig | 2 - arch/mips/Kconfig | 3 +- arch/parisc/Kconfig | 3 +- arch/powerpc/Kconfig | 4 +- arch/ppc/Kconfig | 4 +- arch/s390/Kconfig | 4 +- arch/sh/Kconfig | 3 +- arch/sparc/Kconfig | 3 +- arch/sparc64/Kconfig | 4 +- arch/um/Kconfig | 2 - arch/v850/Kconfig | 2 - arch/x86/Kconfig | 8 +---- arch/xtensa/Kconfig | 2 - drivers/scsi/aic7xxx/Makefile | 9 +---- include/linux/init.h | 3 -- init/Kconfig | 14 ++++++++ kernel/Kconfig.instrumentation | 49 ------------------------------ lib/Kconfig.debug | 14 ++++---- scripts/kconfig/mconf.c | 1 + scripts/kconfig/menu.c | 9 ++---- scripts/mod/modpost.c | 17 +++++----- scripts/setlocalversion | 16 ++++++++++ 34 files changed, 122 insertions(+), 194 deletions(-) create mode 100644 arch/Kconfig delete mode 100644 arch/arm/Kconfig.instrumentation delete mode 100644 kernel/Kconfig.instrumentation mode change 100644 => 100755 scripts/setlocalversion ## # skip git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## SKIPPING: skip git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## # 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-2.6.25 block-for-2.6.25 ## BRANCH for-2.6.25 not in tree /pub/scm/linux/kernel/git/axboe/linux-2.6-block, SKIPPING ## # 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 ## Auto-merged drivers/ide/legacy/ide_platform.c Merge made by recursive. arch/arm/mach-rpc/riscpc.c | 2 +- arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- arch/blackfin/mach-bf533/boards/H8606.c | 2 +- arch/blackfin/mach-bf533/boards/cm_bf533.c | 2 +- arch/blackfin/mach-bf533/boards/ezkit.c | 2 +- arch/blackfin/mach-bf533/boards/stamp.c | 2 +- arch/blackfin/mach-bf537/boards/cm_bf537.c | 2 +- arch/blackfin/mach-bf537/boards/generic_board.c | 2 +- arch/blackfin/mach-bf537/boards/minotaur.c | 2 +- arch/blackfin/mach-bf537/boards/stamp.c | 2 +- arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +- arch/blackfin/mach-bf561/boards/ezkit.c | 2 +- arch/sh/boards/landisk/setup.c | 2 +- arch/sh/boards/lboxre2/setup.c | 2 +- arch/sh/boards/renesas/r7780rp/setup.c | 2 +- arch/sh/boards/renesas/rts7751r2d/setup.c | 2 +- arch/sh/boards/renesas/sdk7780/setup.c | 2 +- arch/sh/boards/se/7722/setup.c | 2 +- drivers/ata/pata_of_platform.c | 2 +- drivers/ata/pata_platform.c | 2 +- drivers/ata/sata_mv.c | 365 ++++++++++++++++++--- drivers/ide/legacy/ide_platform.c | 2 +- include/linux/{pata_platform.h => ata_platform.h} | 13 +- 23 files changed, 351 insertions(+), 69 deletions(-) rename include/linux/{pata_platform.h => ata_platform.h} (75%) ## # 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.25 infiniband-for-2.6.25 ## Auto-merged drivers/infiniband/ulp/srp/ib_srp.c Merge made by recursive. drivers/infiniband/core/cm.c | 89 +++++++++++++++++++------- drivers/infiniband/core/fmr_pool.c | 7 ++- drivers/infiniband/hw/ehca/ehca_classes.h | 1 + drivers/infiniband/hw/ehca/ehca_irq.c | 2 + drivers/infiniband/hw/ehca/ehca_iverbs.h | 5 ++ drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/ehca/ehca_reqs.c | 4 + drivers/infiniband/hw/ehca/ehca_sqp.c | 91 ++++++++++++++++++++++++++ drivers/infiniband/hw/mlx4/main.c | 1 + drivers/infiniband/hw/mthca/mthca_cmd.c | 11 ++- drivers/infiniband/hw/mthca/mthca_main.c | 3 +- drivers/infiniband/hw/mthca/mthca_provider.c | 22 ++----- drivers/infiniband/hw/mthca/mthca_qp.c | 13 ++-- drivers/infiniband/hw/mthca/mthca_srq.c | 47 +++++--------- drivers/infiniband/ulp/ipoib/ipoib_main.c | 19 +++--- drivers/infiniband/ulp/srp/ib_srp.c | 53 ++++++++++++---- drivers/infiniband/ulp/srp/ib_srp.h | 1 + drivers/net/mlx4/fw.c | 6 -- drivers/net/mlx4/fw.h | 3 - drivers/net/mlx4/main.c | 9 +-- drivers/net/mlx4/mr.c | 2 +- 21 files changed, 271 insertions(+), 120 deletions(-) ## # 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. ## # skip git /home/rmk/linux-2.6-arm.git devel arm-devel ## SKIPPING: skip git /home/rmk/linux-2.6-arm.git devel arm-devel ## # 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 ## Merge made by recursive. crypto/async_tx/async_memcpy.c | 38 ++++----- crypto/async_tx/async_memset.c | 28 +++--- crypto/async_tx/async_tx.c | 9 +- crypto/async_tx/async_xor.c | 124 +++++++++++++++++----------- drivers/dma/Kconfig | 1 + drivers/dma/dmaengine.c | 49 +++++++----- drivers/dma/ioat_dma.c | 43 ++++------ drivers/dma/iop-adma.c | 138 ++++++++++++-------------------- include/asm-arm/arch-iop13xx/adma.h | 18 +++-- include/asm-arm/hardware/iop3xx-adma.h | 30 ++++--- include/linux/async_tx.h | 13 ++- include/linux/dmaengine.h | 29 ++++--- 12 files changed, 259 insertions(+), 261 deletions(-) ## # 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 ## Merge made by recursive. drivers/mmc/core/Kconfig | 12 +++ drivers/mmc/core/Makefile | 1 + drivers/mmc/core/bus.c | 12 +++ drivers/mmc/core/core.c | 8 ++ drivers/mmc/core/lock.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/core/lock.h | 51 +++++++++++ drivers/mmc/core/mmc.c | 20 ++++- drivers/mmc/core/mmc_ops.c | 117 +++++++++++++++++++++++++ drivers/mmc/core/mmc_ops.h | 3 + drivers/mmc/core/sd.c | 20 ++++- include/linux/mmc/card.h | 3 + include/linux/mmc/mmc.h | 8 ++ 12 files changed, 460 insertions(+), 2 deletions(-) create mode 100644 drivers/mmc/core/lock.c create mode 100644 drivers/mmc/core/lock.h ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Removed drivers/mtd/maps/pnc2000.c Merge made by recursive. drivers/mtd/Kconfig | 11 + drivers/mtd/Makefile | 1 + drivers/mtd/chips/cfi_cmdset_0001.c | 78 ++- drivers/mtd/chips/cfi_cmdset_0002.c | 14 +- drivers/mtd/chips/cfi_probe.c | 12 +- drivers/mtd/chips/jedec_probe.c | 1376 +++++++++++++++-------------------- drivers/mtd/cmdlinepart.c | 9 +- drivers/mtd/devices/lart.c | 2 +- drivers/mtd/devices/mtd_dataflash.c | 2 +- drivers/mtd/maps/Kconfig | 9 +- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/physmap.c | 162 +++-- drivers/mtd/maps/physmap_of.c | 88 +-- drivers/mtd/maps/pnc2000.c | 93 --- drivers/mtd/maps/scb2_flash.c | 2 +- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/mtdchar.c | 8 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/mtdoops.c | 170 +++-- drivers/mtd/nand/Kconfig | 17 +- drivers/mtd/nand/Makefile | 2 + drivers/mtd/nand/at91_nand.c | 12 +- drivers/mtd/nand/bf5xx_nand.c | 39 +- drivers/mtd/nand/cafe_nand.c | 19 + drivers/mtd/nand/nand_base.c | 8 +- drivers/mtd/nand/orion_nand.c | 171 +++++ drivers/mtd/nand/pasemi_nand.c | 243 ++++++ drivers/mtd/nand/plat_nand.c | 2 + drivers/mtd/nand/s3c2410.c | 48 +- drivers/mtd/ofpart.c | 74 ++ drivers/mtd/onenand/onenand_base.c | 91 ++- drivers/mtd/redboot.c | 25 +- drivers/mtd/ubi/build.c | 674 +++++++++++++----- drivers/mtd/ubi/cdev.c | 244 +++++-- drivers/mtd/ubi/debug.h | 21 +- drivers/mtd/ubi/eba.c | 321 +++++---- drivers/mtd/ubi/gluebi.c | 9 +- drivers/mtd/ubi/io.c | 10 + drivers/mtd/ubi/kapi.c | 177 +++-- drivers/mtd/ubi/misc.c | 2 +- drivers/mtd/ubi/scan.c | 12 +- drivers/mtd/ubi/ubi.h | 171 ++++-- drivers/mtd/ubi/upd.c | 185 ++++-- drivers/mtd/ubi/vmt.c | 208 +++--- drivers/mtd/ubi/vtbl.c | 45 +- drivers/mtd/ubi/wl.c | 338 +++++---- fs/jffs2/acl.c | 6 +- fs/jffs2/acl.h | 2 - fs/jffs2/fs.c | 6 +- fs/jffs2/nodelist.c | 9 +- fs/jffs2/readinode.c | 29 +- fs/jffs2/write.c | 28 +- include/linux/mtd/cfi.h | 12 + include/linux/mtd/mtdram.h | 8 + include/linux/mtd/onenand_regs.h | 1 + include/linux/mtd/partitions.h | 9 +- include/linux/mtd/ubi.h | 18 +- include/mtd/mtd-abi.h | 2 +- include/mtd/ubi-header.h | 47 ++- include/mtd/ubi-user.h | 127 +++- 60 files changed, 3435 insertions(+), 2079 deletions(-) delete mode 100644 drivers/mtd/maps/pnc2000.c create mode 100644 drivers/mtd/nand/orion_nand.c create mode 100644 drivers/mtd/nand/pasemi_nand.c create mode 100644 drivers/mtd/ofpart.c create mode 100644 include/linux/mtd/mtdram.h ## # gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.25.git master net ## BRANCH master not in tree /pub/scm/linux/kernel/git/davem/net-2.6.25.git, SKIPPING ## # merge net resolve /home/jejb/net-resolve.diff ## MERGE net not in tree, SKIPPING ## # git git://git.linux-nfs.org/pub/linux/nfs-2.6.git master nfs ## Already up-to-date. ## # skip git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390 ## SKIPPING: skip git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390 ## # git git://git.o-hand.com/linux-rpurdie-backlight for-linus backlight ## Already up-to-date. ## # gitfetch git://git.infradead.org/battery-2.6 master battery ## ## # merge battery resolve /home/jejb/battery-resolve.diff ## Already up-to-date. WARNING: Merge successful but resolve requested ## # skip git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus ocfs2 ## SKIPPING: skip git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus ocfs2 ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux ## BRANCH for-linus not in tree /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git, SKIPPING ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # skip git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## SKIPPING: skip git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## # 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 ## Auto-merged Documentation/lguest/lguest.c Removed include/net/9p/conn.h Removed net/9p/mux.c Merge made by recursive. Documentation/lguest/lguest.c | 289 +++++++++++ fs/9p/fid.c | 4 +- fs/9p/v9fs.c | 51 +-- fs/9p/v9fs.h | 5 +- fs/9p/vfs_file.c | 4 +- fs/9p/vfs_inode.c | 5 + include/net/9p/9p.h | 1 + include/net/9p/client.h | 5 +- include/net/9p/conn.h | 57 --- include/net/9p/transport.h | 11 +- net/9p/Makefile | 1 - net/9p/client.c | 161 +++++-- net/9p/mod.c | 7 +- net/9p/mux.c | 1060 --------------------------------------- net/9p/trans_fd.c | 1103 ++++++++++++++++++++++++++++++++++++++++- net/9p/trans_virtio.c | 358 ++++++++------ net/9p/util.c | 20 +- 17 files changed, 1753 insertions(+), 1389 deletions(-) delete mode 100644 include/net/9p/conn.h delete mode 100644 net/9p/mux.c ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # git git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## Removed fs/xfs/Kbuild Removed fs/xfs/linux-2.6/spin.h Removed fs/xfs/xfs_iocore.c Merge made by recursive. fs/xfs/Kbuild | 6 - fs/xfs/Makefile | 118 ++++++- fs/xfs/Makefile-linux-2.6 | 118 ------ fs/xfs/linux-2.6/spin.h | 45 --- fs/xfs/linux-2.6/xfs_aops.c | 43 ++- fs/xfs/linux-2.6/xfs_buf.c | 57 +--- fs/xfs/linux-2.6/xfs_buf.h | 1 - fs/xfs/linux-2.6/xfs_export.c | 25 +- fs/xfs/linux-2.6/xfs_globals.c | 3 +- fs/xfs/linux-2.6/xfs_ioctl.c | 86 ++--- fs/xfs/linux-2.6/xfs_ioctl32.c | 9 +- fs/xfs/linux-2.6/xfs_iops.c | 139 ++++++-- fs/xfs/linux-2.6/xfs_linux.h | 34 +-- fs/xfs/linux-2.6/xfs_lrw.c | 122 +++---- fs/xfs/linux-2.6/xfs_lrw.h | 16 +- fs/xfs/linux-2.6/xfs_super.c | 501 +++++++++++++++++++++++++- fs/xfs/linux-2.6/xfs_vnode.c | 118 +++---- fs/xfs/linux-2.6/xfs_vnode.h | 62 ++-- fs/xfs/quota/xfs_dquot.c | 12 +- fs/xfs/quota/xfs_dquot.h | 5 - fs/xfs/quota/xfs_dquot_item.c | 27 +- fs/xfs/quota/xfs_qm.c | 14 +- fs/xfs/quota/xfs_qm.h | 6 +- fs/xfs/quota/xfs_qm_syscalls.c | 19 +- fs/xfs/support/debug.c | 7 +- fs/xfs/support/ktrace.c | 4 - fs/xfs/support/ktrace.h | 3 - fs/xfs/xfs.h | 2 +- fs/xfs/xfs_ag.h | 2 +- fs/xfs/xfs_alloc.c | 19 +- fs/xfs/xfs_attr.c | 2 +- fs/xfs/xfs_attr_leaf.c | 8 +- fs/xfs/xfs_bit.c | 103 ------ fs/xfs/xfs_bit.h | 27 ++- fs/xfs/xfs_bmap.c | 22 +- fs/xfs/xfs_bmap.h | 2 + fs/xfs/xfs_bmap_btree.c | 3 +- fs/xfs/xfs_btree.h | 2 + fs/xfs/xfs_buf_item.c | 10 +- fs/xfs/xfs_buf_item.h | 2 + fs/xfs/xfs_da_btree.c | 13 +- fs/xfs/xfs_da_btree.h | 1 + fs/xfs/xfs_dfrag.c | 7 +- fs/xfs/xfs_dinode.h | 82 ++--- fs/xfs/xfs_dir2.c | 3 +- fs/xfs/xfs_error.c | 31 -- fs/xfs/xfs_error.h | 2 + fs/xfs/xfs_extfree_item.c | 21 +- fs/xfs/xfs_filestream.c | 2 +- fs/xfs/xfs_fs.h | 10 +- fs/xfs/xfs_fsops.c | 13 +- fs/xfs/xfs_ialloc_btree.h | 2 - fs/xfs/xfs_iget.c | 185 ++++------ fs/xfs/xfs_inode.c | 162 +++------ fs/xfs/xfs_inode.h | 97 ++--- fs/xfs/xfs_inode_item.c | 26 +- fs/xfs/xfs_iocore.c | 119 ------ fs/xfs/xfs_iomap.c | 212 ++++++------ fs/xfs/xfs_iomap.h | 5 +- fs/xfs/xfs_itable.c | 12 +- fs/xfs/xfs_log.c | 383 +++++++++----------- fs/xfs/xfs_log.h | 3 +- fs/xfs/xfs_log_priv.h | 96 ++--- fs/xfs/xfs_log_recover.c | 197 +++++------ fs/xfs/xfs_mount.c | 340 ++++++++++-------- fs/xfs/xfs_mount.h | 117 +------ fs/xfs/xfs_mru_cache.c | 54 ++-- fs/xfs/xfs_qmops.c | 7 +- fs/xfs/xfs_rename.c | 9 +- fs/xfs/xfs_rtalloc.c | 19 +- fs/xfs/xfs_rtalloc.h | 2 - fs/xfs/xfs_rw.h | 12 +- fs/xfs/xfs_trans.c | 7 +- fs/xfs/xfs_trans.h | 2 + fs/xfs/xfs_trans_ail.c | 52 ++-- fs/xfs/xfs_trans_item.c | 1 + fs/xfs/xfs_trans_priv.h | 5 +- fs/xfs/xfs_utils.c | 9 +- fs/xfs/xfs_utils.h | 2 - fs/xfs/xfs_vfsops.c | 769 ++-------------------------------------- fs/xfs/xfs_vfsops.h | 8 +- fs/xfs/xfs_vnodeops.c | 128 +++----- fs/xfs/xfs_vnodeops.h | 1 - 83 files changed, 2052 insertions(+), 2980 deletions(-) delete mode 100644 fs/xfs/Kbuild delete mode 100644 fs/xfs/linux-2.6/spin.h delete mode 100644 fs/xfs/xfs_iocore.c ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## 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 ## Merge made by recursive. arch/x86/kernel/Makefile | 6 ++++-- arch/x86/mm/ioremap.c | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # skip quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/patches/. gregkh-everything ## SKIPPING: skip quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/patches/. gregkh-everything ## # skip merge gregkh-everything ## SKIPPING: skip merge gregkh-everything ## # check ## Differences exist, continuing ## # label ## Created commit 55bdf6e: 2.6.24-mc14 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- ## ing deltas: 96% (658/679) Resolving deltas: 98% (668/679) Resolving deltas: 100% (679/679) Resolving deltas: 100% (679/679), completed with 73 local objects. From git://git.infradead.org/mtd-2.6 d0bf379..df66e71 master -> mtd fatal: '/pub/scm/linux/kernel/git/davem/net-2.6.25.git': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly error: branch 'net' not found. Already on branch "2.6.24-mc14" Already on branch "2.6.24-mc14" error: branch 'selinux' not found. remote: Counting objects: 35, done. remote: Compressing objects: 5% (1/18) remote: Compressing objects: 11% (2/18) remote: Compressing objects: 16% (3/18) remote: Compressing objects: 22% (4/18) remote: Compressing objects: 27% (5/18) remote: Compressing objects: 33% (6/18) remote: Compressing objects: 38% (7/18) remote: Compressing objects: 44% (8/18) remote: Compressing objects: 50% (9/18) remote: Compressing objects: 55% (10/18) remote: Compressing objects: 61% (11/18) remote: Compressing objects: 66% (12/18) remote: Compressing objects: 72% (13/18) remote: Compressing objects: 77% (14/18) remote: Compressing objects: 83% (15/18) remote: Compressing objects: 88% (16/18) remote: Compressing objects: 94% (17/18) remote: Compressing objects: 100% (18/18) remote: Compressing objects: 100% (18/18), done. remote: Total 18 (delta 14), reused 0 (delta 0) From /pub/scm/linux/kernel/git/ericvh/v9fs 5c94296..42e8d88 v9fs-devel -> v9fs-devel remote: Counting objects: 25, 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) remote: Compressing objects: 70% (7/10) remote: Compressing objects: 80% (8/10) remote: Compressing objects: 90% (9/10) remote: Compressing objects: 100% (10/10) remote: Compressing objects: 100% (10/10), done. remote: Total 18 (delta 14), reused 12 (delta 8) From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 d987402..5829375 master -> x86