From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 b86db47..3561d43 master -> origin/mast## # errors /pub/linux/kernel/people/jejb/storage-tChecking out files: 18% (169/891) Checking out files: 19% (170/891) Checking out files: 20% (179/891) Checking out filRemoving patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Updating 151f52f..4531491 Fast-forward Documentation/ABI/obsolete/proc-pid-oom_adj | 22 + Documentation/arm/OMAP/DSS | 7 +- Documentation/block/switching-sched.txt | 8 +- Documentation/feature-removal-schedule.txt | 10 + .../filesystems/xfs-delayed-logging-design.txt | 11 - Documentation/kernel-parameters.txt | 2 +- Documentation/leds-class.txt | 21 +- Documentation/leds/leds-lp5521.txt | 88 ++ Documentation/leds/leds-lp5523.txt | 83 ++ Documentation/networking/ip-sysctl.txt | 9 + Documentation/rbtree.txt | 4 +- Documentation/sysctl/kernel.txt | 14 + MAINTAINERS | 19 +- Makefile | 2 +- arch/arm/Kconfig | 34 +- arch/arm/common/gic.c | 28 +- arch/arm/include/asm/hardware/it8152.h | 2 +- arch/arm/kernel/hw_breakpoint.c | 3 +- arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/stacktrace.c | 2 +- arch/arm/kernel/traps.c | 5 +- arch/arm/kernel/unwind.c | 2 +- arch/arm/mach-ep93xx/include/mach/dma.h | 111 ++- arch/arm/mach-kirkwood/common.c | 7 +- arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/lacie_v2-common.c | 14 - arch/arm/mach-kirkwood/lacie_v2-common.h | 2 - arch/arm/mach-kirkwood/mpp.c | 4 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- arch/arm/mach-kirkwood/ts41x-setup.c | 14 +- arch/arm/mach-mmp/include/mach/cputype.h | 3 +- arch/arm/mach-mv78xx0/mpp.c | 4 +- arch/arm/mach-omap1/devices.c | 5 +- arch/arm/mach-omap1/include/mach/camera.h | 2 + arch/arm/mach-omap2/board-devkit8000.c | 3 - arch/arm/mach-orion5x/mpp.c | 4 +- arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 2 - arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-s3c64xx/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-ap4evb.c | 52 +- arch/arm/mach-shmobile/clock-sh7372.c | 102 ++ arch/arm/mach-shmobile/include/mach/gpio.h | 4 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/arm/mach-shmobile/intc-sh7372.c | 2 +- arch/arm/mach-vexpress/ct-ca9x4.c | 2 + arch/arm/mm/dma-mapping.c | 2 +- arch/arm/plat-omap/devices.c | 4 +- arch/arm/plat-omap/dma.c | 2 + arch/arm/plat-orion/include/plat/pcie.h | 3 + arch/arm/plat-orion/pcie.c | 5 - arch/ia64/hp/sim/simscsi.c | 4 +- arch/s390/Kconfig.debug | 12 + arch/s390/include/asm/page.h | 5 + arch/s390/kernel/kprobes.c | 70 +- arch/s390/mm/gup.c | 7 +- arch/sh/Kconfig | 1 + arch/sh/Makefile | 3 - arch/sh/boards/Kconfig | 7 - arch/sh/boards/Makefile | 2 + arch/sh/boards/board-edosk7705.c | 78 ++ .../setup.c => board-secureedge5410.c} | 38 +- arch/sh/boards/mach-edosk7705/Makefile | 5 - arch/sh/boards/mach-edosk7705/io.c | 71 -- arch/sh/boards/mach-edosk7705/setup.c | 36 - arch/sh/boards/mach-microdev/io.c | 246 +----- arch/sh/boards/mach-microdev/setup.c | 23 +- arch/sh/boards/mach-se/7206/Makefile | 2 +- arch/sh/boards/mach-se/7206/io.c | 104 -- arch/sh/boards/mach-se/7206/irq.c | 4 +- arch/sh/boards/mach-se/7206/setup.c | 15 - arch/sh/boards/mach-se/770x/Makefile | 2 +- arch/sh/boards/mach-se/770x/io.c | 156 --- arch/sh/boards/mach-se/770x/setup.c | 22 - arch/sh/boards/mach-se/7751/Makefile | 2 +- arch/sh/boards/mach-se/7751/io.c | 119 --- arch/sh/boards/mach-se/7751/setup.c | 18 - arch/sh/boards/mach-snapgear/Makefile | 5 - arch/sh/boards/mach-snapgear/io.c | 121 --- arch/sh/boards/mach-systemh/Makefile | 13 - arch/sh/boards/mach-systemh/io.c | 158 --- arch/sh/boards/mach-systemh/irq.c | 61 -- arch/sh/boards/mach-systemh/setup.c | 57 - ...snapgear_defconfig => secureedge5410_defconfig} | 0 arch/sh/configs/systemh_defconfig | 28 - arch/sh/include/asm/addrspace.h | 8 +- arch/sh/include/asm/pgtable.h | 12 - arch/sh/include/asm/system.h | 4 +- arch/sh/include/asm/system_32.h | 36 - arch/sh/include/asm/system_64.h | 3 - arch/sh/include/asm/uncached.h | 40 + arch/sh/include/mach-common/mach/edosk7705.h | 7 - arch/sh/include/mach-common/mach/microdev.h | 9 - .../mach/{snapgear.h => secureedge5410.h} | 22 - arch/sh/include/mach-common/mach/systemh7751.h | 71 -- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 6 +- arch/sh/mm/Kconfig | 2 +- arch/sh/mm/consistent.c | 15 +- arch/sh/mm/uncached.c | 2 +- arch/sh/tools/mach-types | 1 - arch/um/include/asm/ptrace-generic.h | 4 +- arch/um/kernel/ptrace.c | 2 +- arch/x86/include/asm/apic.h | 10 +- arch/x86/include/asm/uv/uv_mmrs.h | 189 ++-- arch/x86/kernel/apic/apic.c | 1 - arch/x86/kernel/apic/x2apic_uv_x.c | 12 +- arch/x86/kernel/cpu/perf_event_amd.c | 4 +- arch/x86/kernel/microcode_amd.c | 2 +- arch/x86/kernel/mmconf-fam10h_64.c | 7 +- arch/x86/kernel/pvclock.c | 38 - arch/x86/mm/tlb.c | 2 +- arch/x86/pci/acpi.c | 103 ++- arch/x86/pci/xen.c | 8 +- arch/x86/platform/uv/tlb_uv.c | 13 +- arch/x86/xen/mmu.c | 2 +- arch/x86/xen/setup.c | 18 +- block/blk-core.c From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 31% (277/891) Checking out files: 32% (286/891) Checking out files: 33% (295/891) Checking out files: 34% (303/891) Checking out files: 35% (312/891) Checking out files: 36% (321/891) Checking out files: 37% (330/891) Checking out files: 38% (339/891) Checking out files: 39% (348/891) Checking out files: 40% (357/891) Checking out files: 41% (366/891) Checking out files: 42% (375/891) Checking out files: 43% (384/891) Checking out files: 44% (393/891) Checking out files: 45% (401/891) Checking out files: 46% (410/891) Checking out files: 47% (419/891) Checking out files: 48% (428/891) Checking out files: 49% (437/891) Checking out files: 50% (446/891) Checking out files: 51% (455/891) Checking out files: 52% (464/891) Checking out files: 53% (473/891) Checking out files: 54% (482/891) Checking out files: 55% (491/891) Checking out files: 56% (499/891) Checking out files: 57% (508/891) Checking out files: 58% (517/891) Checking out files: 59% (526/891) Checking out files: 60% (535/891) Checking out files: 61% (544/891) Checking out files: 62% (553/891) Checking out files: 63% (562/891) Checking out files: 64% (571/891) Checking out files: 65% (580/891) Checking out files: 66% (589/891) Checking out files: 67% (597/891) Checking out files: 68% (606/891) Checking out files: 69% (615/891) Checking out files: 70% (624/891) Checking out files: 71% (633/891) Checking out files: 72% (642/891) Checking out files: 73% (651/891) Checking out files: 74% (660/891) Checking out files: 75% (669/891) Checking out files: 76% (678/891) Checking out files: 77% (687/891) Checking out files: 78% (695/891) Checking out files: 79% (704/891) Checking out files: 80% (713/891) Checking out files: 81% (722/891) Checking out files: 81% (727/891) Checking out files: 82% (731/891) Checking out files: 83% (740/891) Checking out files: 84% (749/891) Checking out files: 85% (758/891) Checking out files: 86% (767/891) Checking out files: 87% (776/891) Checking out files: 88% (785/891) Checking out files: 89% (793/891) Checking out files: 90% (802/891) Checking out files: 91% (811/891) Checking out files: 92% (820/891) Checking out files: 93% (829/891) Checking out files: 94% (838/891) Checking out files: 95% (847/891) Checking out files: 96% (856/891) Checking out files: 97% (865/891) Checking out files: 98% (874/891) Checking out files: 99% (883/891) Checking out files: 100% (891/891) Checking out files: 100% (891/891), done. Switched to branch 'device-mapper' Checking out files: 30% (269/891) Checking out files: 31% (277/891) Checking out files: 32% (286/891) Checking out files: 33% (295/891) Checking out files: 34% (303/891) Checking out files: 35% (312/891) Checking out files: 36% (321/891) Checking out files: 37% (330/891) Checking out files: 38% (339/891) Checking out files: 39% (348/891) Checking out files: 40% (357/891) Checking out files: 41% (366/891) Checking out files: 42% (375/891) Checking out files: 43% (384/891) Checking out files: 44% (393/891) Checking out files: 45% (401/891) Checking out files: 46% (410/891) Checking out files: 47% (419/891) Checking out files: 48% (428/891) Checking out files: 49% (437/891) Checking out files: 50% (446/891) Checking out files: 51% (455/891) Checking out files: 52% (464/891) Checking out files: 53% (473/891) Checking out files: 53% (480/891) Checking out files: 54% (482/891) Checking out files: 55% (491/891) Checking out files: 56% (499/891) Checking out files: 57% (508/891) Checking out files: 58% (517/891) Checking out files: 59% (526/891) Checking out files: 60% (535/891) Checking out files: 61% (544/891) Checking out files: 62% (553/891) Checking out files: 63% (562/891) Checking out files: 64% (571/891) Checking out files: 65% (580/891) Checking out files: 66% (589/891) Checking out files: 67% (597/891) Checking out files: 68% (606/891) Checking out files: 69% (615/891) Checking out files: 70% (624/891) Checking out files: 71% (633/891) Checking out files: 72% (642/891) Checking out files: 73% (651/891) Checking out files: 74% (660/891) Checking out files: 75% (669/891) Checking out files: 76% (678/891) Checking out files: 77% (687/891) Checking out files: 78% (695/891) Checking out files: 79% (704/891) Checking out files: 80% (713/891) Checking out files: 81% (722/891) Checking out files: 81% (730/891) Checking out files: 82% (731/891) Checking out files: 83% (740/891) Checking out files: 84% (749/891) Checking out files: 85% (758/891) Checking out files: 86% (767/891) Checking out files: 87% (776/891) Checking out files: 88% (785/891) Checking out files: 89% (793/891) Checking out files: 90% (802/891) Checking out files: 91% (811/891) Checking out files: 92% (820/891) Checking out files: 93% (829/891) Checking out files: 94% (838/891) Checking out files: 95% (847/891) Checking out files: 96% (856/891) Checking out files: 97% (865/891) Checking out files: 98% (874/891) Checking out files: 99% (883/891) Checking out files: 100% (891/891) Checking out files: 100% (891/891), done. Switched to branch '2.6.37-rc1-stor14' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 92afcf1...2bfc96a master -> scsi-post-merge (forced update) Checking out files: 16% (1872/11122) Checking out files: 17% (1891/11122) Checking out files: 18% (2002/11122) Checking out files: 18% (2048/11122) Checking out files: 19% (2114/11122) Checking out files: 19% (2191/11122) Checking out files: 20% (2225/11122) Checking out files: 20% (2319/11122) Checking out files: 21% (2336/11122) Checking out files: 22% (2447/11122) Checking out files: 22% (2469/11122) Checking out files: 23% (2559/11122) Checking out files: 23% (2606/11122) Checking out files: 24% (2670/11122) Checking out files: 24% (2770/11122) Checking out files: 25% (2781/11122) Checking out files: 26% (2892/11122) Checking out files: 26% (2945/11122) Checking out files: 27% (3003/11122) Checking out files: 28% (3115/11122) Checking out files: 28% (3164/11122) Checking out files: 29% (3226/11122) Checking out files: 30% (3337/11122) Checking out files: 30% (3388/11122) Checking out files: 31% (3448/11122) Checking out files: 32% (3560/11122) Checking out files: 32% (3650/11122) Checking out files: 33% (3671/11122) Checking out files: 34% (3782/11122) Checking out files: 34% (3859/11122) Checking out files: 35% (3893/11122) Checking out files: 36% (4004/11122) Checking out files: 36% (4032/11122) Checking out files: 37% (4116/11122) Checking out files: 37% (4198/11122) Checking out files: 38% (4227/11122) Checking out files: 39% (4338/11122) Checking out files: 39% (4393/11122) Checking out files: 40% (4449/11122) Checking out files: 41% (4561/11122) Checking out files: 41% (4595/11122) Checking out files: 42% (4672/11122) Checking out files: 42% (4695/11122) Checking out files: 43% (4783/11122) Checking out files: 44% (4894/11122) Checking out files: 44% (4900/11122) Checking out files: 45% (5005/11122) Checking out files: 46% (5117/11122) Checking out files: 46% (5156/11122) Checking out files: 47% (5228/11122) Checking out files: 48% (5339/11122) Checking out files: 48% (5367/11122) Checking out files: 49% (5450/11122) Checking out files: 50% (5561/11122) Checking out files: 50% (5595/11122) Checking out files: 51% (5673/11122) Checking out files: 52% (5784/11122) Checking out files: 52% (5789/11122) Checking out files: 53% (5895/11122) Checking out files: 54% (6006/11122) Checking out files: 54% (6026/11122) Checking out files: 55% (6118/11122) Checking out files: 56% (6229/11122) Checking out files: 56% (6230/11122) Checking out files: 57% (6340/11122) Checking out files: 57% (6418/11122) Checking out files: 58% (6451/11122) Checking out files: 59% (6562/11122) Checking out files: 59% (6648/11122) Checking out files: 60% (6674/11122) Checking out files: 61% (6785/11122) Checking out files: 61% (6863/11122) Checking out files: 62% (6896/11122) Checking out files: 63% (7007/11122) Checking out files: 63% (7084/11122) Checking out files: 64% (7119/11122) Checking out files: 65% (7230/11122) Checking out files: 65% (7330/11122) Checking out files: 66% (7341/11122) Checking out files: 67% (7452/11122) Checking out files: 67% (7548/11122) Checking out files: 68% (7563/11122) Checking out files: 69% (7675/11122) Checking out files: 70% (7786/11122) Checking out files: 70% (7834/11122) Checking out files: 71% (7897/11122) Checking out files: 72% (8008/11122) Checking out files: 72% (8070/11122) Checking out files: 73% (8120/11122) Checking out files: 74% (8231/11122) Checking out files: 74% (8307/11122) Checking out files: 75% (8342/11122) Checking out files: 76% (8453/11122) Checking out files: 76% (8489/11122) Checking out files: 77% (8564/11122) Checking out files: 78% (8676/11122) Checking out files: 78% (8705/11122) Checking out files: 79% (8787/11122) Checking out files: 79% (8844/11122) Checking out files: 80% (8898/11122) Checking out files: 81% (9009/11122) Checking out files: 81% (9066/11122) Checking out files: 82% (9121/11122) Checking out files: 83% (9232/11122) Checking out files: 83% (9264/11122) Checking out files: 84% (9343/11122) Checking out files: 85% (9454/11122) Checking out files: 85% (9496/11122) Checking out files: 86% (9565/11122) Checking out files: 87% (9677/11122) Checking out files: 87% (9722/11122) Checking out files: 88% (9788/11122) Checking out files: 89% (9899/11122) Checking out files: 89% (9950/11122) Checking out files: 90% (10010/11122) Checking out files: 91% (10122/11122) Checking out files: 91% (10174/11122) Checking out files: 92% (10233/11122) Checking out files: 93% (10344/11122) Checking out files: 93% (10399/11122) Checking out files: 94% (10455/11122) Checking out files: 95% (10566/11122) Checking out files: 95% (10610/11122) Checking out files: 96% (10678/11122) Checking out files: 97% (10789/11122) Checking out files: 97% (10834/11122) Checking out files: 98% (10900/11122) Checking out files: 99% (11011/11122) Checking out files: 99% (11070/11122) Checking out files: 100% (11122/11122) Checking out files: 100% (11122/11122), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc1-stor14' From . * branch scsi-post-merge -> FETCH_HEAD s390/char/tape_core.c | 68 ++- drivers/s390/char/vmlogrdr.c | 36 +- drivers/s390/cio/device.c | 11 +- drivers/s390/net/qeth_core.h | 9 - drivers/s390/net/qeth_core_main.c | 55 +- drivers/s390/scsi/zfcp_scsi.c | 4 +- drivers/scsi/3w-9xxx.c | 4 +- drivers/scsi/3w-sas.c | 4 +- drivers/scsi/3w-xxxx.c | 4 +- drivers/scsi/53c700.c | 8 +- drivers/scsi/BusLogic.c | 3 +- drivers/scsi/BusLogic.h | 2 +- drivers/scsi/NCR5380.c | 3 +- drivers/scsi/NCR5380.h | 2 +- drivers/scsi/NCR53c406a.c | 4 +- drivers/scsi/a100u2w.c | 4 +- drivers/scsi/aacraid/linit.c | 4 +- drivers/scsi/advansys.c | 4 +- drivers/scsi/aha152x.c | 4 +- drivers/scsi/aha1542.c | 4 +- drivers/scsi/aha1542.h | 2 +- drivers/scsi/aha1740.c | 4 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 4 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- drivers/scsi/aic7xxx_old.c | 4 +- drivers/scsi/arcmsr/arcmsr_hba.c | 7 +- drivers/scsi/arm/acornscsi.c | 4 +- drivers/scsi/arm/fas216.c | 10 +- drivers/scsi/arm/fas216.h | 18 +- drivers/scsi/atari_NCR5380.c | 4 +- drivers/scsi/atari_scsi.c | 17 - drivers/scsi/atp870u.c | 4 +- drivers/scsi/bfa/bfad_im.c | 7 +- drivers/scsi/dc395x.c | 3 +- drivers/scsi/dpt_i2o.c | 4 +- drivers/scsi/dpti.h | 2 +- drivers/scsi/dtc.h | 2 +- drivers/scsi/eata.c | 7 +- drivers/scsi/eata_pio.c | 4 +- drivers/scsi/esp_scsi.c | 4 +- drivers/scsi/fd_mcs.c | 4 +- drivers/scsi/fdomain.c | 4 +- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_scsi.c | 4 +- drivers/scsi/g_NCR5380.h | 2 +- drivers/scsi/gdth.c | 6 +- drivers/scsi/hpsa.c | 7 +- drivers/scsi/hptiop.c | 4 +- drivers/scsi/ibmmca.c | 6 +- drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- drivers/scsi/imm.c | 4 +- drivers/scsi/in2000.c | 4 +- drivers/scsi/in2000.h | 2 +- drivers/scsi/initio.c | 4 +- drivers/scsi/ipr.c | 4 +- drivers/scsi/ips.c | 6 +- drivers/scsi/libfc/fc_fcp.c | 4 +- drivers/scsi/libiscsi.c | 4 +- drivers/scsi/libsas/sas_scsi_host.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 +- drivers/scsi/mac53c94.c | 4 +- drivers/scsi/megaraid.c | 6 +- drivers/scsi/megaraid.h | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 7 +- drivers/scsi/megaraid/megaraid_sas.c | 4 +- drivers/scsi/mesh.c | 4 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- drivers/scsi/ncr53c8xx.c | 4 +- drivers/scsi/nsp32.c | 7 +- drivers/scsi/pas16.h | 2 +- drivers/scsi/pcmcia/nsp_cs.c | 4 +- drivers/scsi/pcmcia/nsp_cs.h | 3 +- drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- drivers/scsi/pmcraid.c | 4 +- drivers/scsi/ppa.c | 4 +- drivers/scsi/ps3rom.c | 4 +- drivers/scsi/qla1280.c | 4 +- drivers/scsi/qla2xxx/qla_os.c | 7 +- drivers/scsi/qla4xxx/ql4_os.c | 7 +- drivers/scsi/qlogicfas408.c | 4 +- drivers/scsi/qlogicfas408.h | 3 +- drivers/scsi/qlogicpti.c | 4 +- drivers/scsi/scsi.c | 18 +- drivers/scsi/scsi_debug.c | 4 +- drivers/scsi/scsi_error.c | 24 +- drivers/scsi/stex.c | 4 +- drivers/scsi/sun3_NCR5380.c | 4 +- drivers/scsi/sun3_scsi.h | 3 +- drivers/scsi/sym53c416.c | 4 +- drivers/scsi/sym53c416.h | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- drivers/scsi/t128.h | 3 +- drivers/scsi/tmscsim.c | 4 +- drivers/scsi/u14-34f.c | 6 +- drivers/scsi/ultrastor.c | 4 +- drivers/scsi/ultrastor.h | 3 +- drivers/scsi/vmw_pvscsi.c | 4 +- drivers/scsi/wd33c93.c | 6 +- drivers/scsi/wd33c93.h | 3 +- drivers/scsi/wd7000.c | 4 +- drivers/serial/8250_pci.c | 5 + drivers/serial/bfin_5xx.c | 31 +- drivers/serial/kgdboc.c | 59 ++ drivers/sh/clk/core.c | 96 ++- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/dynamic.c | 2 +- drivers/sh/intc/virq.c | 2 +- drivers/staging/ath6kl/Kconfig | 2 +- .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 4 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 5 +- drivers/staging/ath6kl/os/linux/cfg80211.c | 7 +- drivers/staging/batman-adv/hard-interface.c | 15 +- drivers/staging/batman-adv/routing.c | 12 +- drivers/staging/batman-adv/routing.h | 4 +- drivers/staging/batman-adv/unicast.c | 2 +- drivers/staging/bcm/Bcmchar.c | 49 +- drivers/staging/brcm80211/README | 2 +- drivers/staging/brcm80211/TODO | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 12 +- drivers/staging/cpia/cpia.c | 6 +- drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 1 - drivers/staging/hv/hv_utils.c | 3 - drivers/staging/hv/storvsc_drv.c | 7 +- .../staging/intel_sst/intel_sst_app_interface.c | 284 +++--- drivers/staging/intel_sst/intel_sst_common.h | 4 +- drivers/staging/keucr/init.c | 18 +- drivers/staging/keucr/ms.c | 14 +- drivers/staging/keucr/msscsi.c | 6 +- drivers/staging/keucr/scsiglue.c | 4 +- drivers/staging/keucr/sdscsi.c | 4 +- drivers/staging/keucr/smilsub.c | 18 +- drivers/staging/keucr/transport.c | 2 +- drivers/staging/olpc_dcon/olpc_dcon.c | 4 - drivers/staging/rt2860/common/cmm_aes.c | 2 - drivers/staging/rt2860/usb_main_dev.c | 1 + drivers/staging/rtl8192e/r8192E_core.c | 3 + drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- drivers/staging/solo6x10/solo6010-v4l2.c | 2 +- drivers/staging/stradis/stradis.c | 11 +- drivers/staging/tidspbridge/Kconfig | 1 - drivers/staging/tidspbridge/Makefile | 7 +- drivers/staging/tidspbridge/core/_deh.h | 5 +- drivers/staging/tidspbridge/core/_tiomap.h | 19 +- drivers/staging/tidspbridge/core/dsp-mmu.c | 317 ------ drivers/staging/tidspbridge/core/io_sm.c | 180 +++- drivers/staging/tidspbridge/core/tiomap3430.c | 1083 ++++++++++++++++++-- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 + drivers/staging/tidspbridge/core/tiomap_io.c | 17 +- drivers/staging/tidspbridge/core/ue_deh.c | 115 ++- drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 + drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 ++ drivers/staging/tidspbridge/hw/MMURegAcM.h | 225 ++++ drivers/staging/tidspbridge/hw/hw_defs.h | 58 ++ drivers/staging/tidspbridge/hw/hw_mmu.c | 562 ++++++++++ drivers/staging/tidspbridge/hw/hw_mmu.h | 163 +++ .../tidspbridge/include/dspbridge/cfgdefs.h | 1 + .../staging/tidspbridge/include/dspbridge/dev.h | 24 + .../staging/tidspbridge/include/dspbridge/dmm.h | 75 ++ .../staging/tidspbridge/include/dspbridge/drv.h | 10 + .../tidspbridge/include/dspbridge/dsp-mmu.h | 67 -- .../tidspbridge/include/dspbridge/dspdefs.h | 44 + .../tidspbridge/include/dspbridge/dspioctl.h | 7 + .../staging/tidspbridge/include/dspbridge/proc.h | 46 + drivers/staging/tidspbridge/pmgr/dev.c | 63 ++- drivers/staging/tidspbridge/pmgr/dmm.c | 533 ++++++++++ drivers/staging/tidspbridge/pmgr/dspapi.c | 34 +- drivers/staging/tidspbridge/rmgr/drv.c | 15 + drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 + drivers/staging/tidspbridge/rmgr/node.c | 48 +- drivers/staging/tidspbridge/rmgr/proc.c | 197 ++++- drivers/staging/tm6000/tm6000-video.c | 1 + drivers/staging/udlfb/udlfb.c | 2 +- drivers/staging/vt6656/main_usb.c | 3 +- .../staging/westbridge/astoria/api/src/cyasusb.c | 1 - drivers/staging/wlan-ng/cfg80211.c | 6 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/tty/Makefile | 11 + drivers/{char => tty}/n_gsm.c | 5 +- drivers/{char => tty}/n_hdlc.c | 0 drivers/{char => tty}/n_r3964.c | 0 drivers/{char => tty}/n_tty.c | 0 drivers/{char => tty}/pty.c | 0 drivers/{char => tty}/sysrq.c | 0 drivers/{char => tty}/tty_audit.c | 0 drivers/{char => tty}/tty_buffer.c | 14 +- drivers/{char => tty}/tty_io.c | 0 drivers/{char => tty}/tty_ioctl.c | 0 drivers/{char => tty}/tty_ldisc.c | 49 +- drivers/{char => tty}/tty_mutex.c | 0 drivers/{char => tty}/tty_port.c | 0 drivers/{char => tty/vt}/.gitignore | 0 drivers/tty/vt/Makefile | 34 + drivers/{char => tty/vt}/consolemap.c | 0 drivers/{char => tty/vt}/cp437.uni | 0 drivers/{char => tty/vt}/defkeymap.c_shipped | 0 drivers/{char => tty/vt}/defkeymap.map | 0 drivers/{char => tty/vt}/keyboard.c | 0 drivers/{char => tty/vt}/selection.c | 0 drivers/{char => tty/vt}/vc_screen.c | 6 +- drivers/{char => tty/vt}/vt.c | 0 drivers/{char => tty/vt}/vt_ioctl.c | 0 drivers/usb/core/devio.c | 7 +- drivers/usb/gadget/Kconfig | 2 +- drivers/usb/gadget/goku_udc.h | 3 +- drivers/usb/gadget/u_serial.c | 54 +- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ehci-mxc.c | 14 +- drivers/usb/host/ohci-jz4740.c | 2 +- drivers/usb/image/microtek.c | 6 +- drivers/usb/misc/iowarrior.c | 1 + drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/musb/blackfin.c | 80 +- drivers/usb/musb/musb_core.c | 41 +- drivers/usb/musb/musb_core.h | 2 +- drivers/usb/musb/musb_gadget.c | 41 +- drivers/usb/musb/musb_regs.h | 3 +- drivers/usb/musb/musbhsdma.c | 14 + drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 7 + drivers/usb/serial/option.c | 2 +- drivers/usb/storage/scsiglue.c | 4 +- drivers/usb/storage/uas.c | 9 +- drivers/uwb/allocator.c | 3 +- drivers/video/backlight/adp8860_bl.c | 8 +- drivers/video/backlight/l4f00242t03.c | 2 +- drivers/video/backlight/lms283gf05.c | 2 +- drivers/video/backlight/mbp_nvidia_bl.c | 18 + drivers/video/backlight/pwm_bl.c | 7 +- drivers/video/backlight/s6e63m0.c | 7 +- drivers/video/omap2/vram.c | 17 +- drivers/video/riva/rivafb-i2c.c | 1 - drivers/video/sh_mobile_hdmi.c | 5 +- drivers/video/sh_mobile_lcdcfb.c | 21 +- drivers/video/sis/sis_main.c | 8 +- drivers/xen/events.c | 25 +- fs/bio.c | 23 +- fs/cifs/inode.c | 1 - fs/cifs/ioctl.c | 12 +- fs/ext4/ext4.h | 4 +- fs/ext4/inode.c | 3 + fs/ext4/mballoc.c | 2 - fs/ext4/page-io.c | 97 +- fs/ext4/super.c | 102 ++- fs/gfs2/export.c | 46 +- fs/gfs2/glock.c | 21 +- fs/gfs2/inode.c | 152 +--- fs/gfs2/inode.h | 4 +- fs/gfs2/rgrp.c | 91 +- fs/hugetlbfs/inode.c | 3 +- fs/ioprio.c | 18 +- fs/locks.c | 19 +- fs/nfsd/nfs4state.c | 16 +- fs/ocfs2/ocfs2.h | 6 +- fs/openpromfs/inode.c | 2 +- fs/xfs/linux-2.6/xfs_aops.c | 7 +- fs/xfs/linux-2.6/xfs_buf.c | 2 +- fs/xfs/linux-2.6/xfs_ioctl.c | 2 +- fs/xfs/linux-2.6/xfs_iops.c | 3 +- fs/xfs/linux-2.6/xfs_super.c | 3 - fs/xfs/linux-2.6/xfs_sync.c | 1 + fs/xfs/xfs_filestream.c | 8 +- fs/xfs/xfs_mount.c | 1 + fs/xfs/xfs_quota.h | 20 +- include/drm/ttm/ttm_bo_api.h | 4 + include/drm/ttm/ttm_bo_driver.h | 79 ++- include/linux/atomic.h | 37 + include/linux/bio.h | 4 - include/linux/blk_types.h | 6 +- include/linux/blkdev.h | 3 +- include/linux/drbd.h | 2 +- include/linux/fsl-diu-fb.h | 1 - include/linux/highmem.h | 1 + include/linux/i2c-id.h | 22 - include/linux/i2c.h | 2 +- include/linux/i2c/adp5588.h | 15 +- include/linux/if_vlan.h | 25 + include/linux/input.h | 4 +- include/linux/iocontext.h | 1 - include/linux/kernel.h | 246 +----- include/linux/leds-lp5521.h | 47 + include/linux/leds-lp5523.h | 47 + include/linux/leds.h | 47 +- include/linux/libata.h | 2 +- include/linux/mmc/sh_mmcif.h | 18 +- include/linux/netdevice.h | 5 + include/linux/netfilter.h | 2 +- include/linux/perf_event.h | 10 + include/linux/printk.h | 248 +++++ include/linux/pwm_backlight.h | 1 + include/linux/radix-tree.h | 39 +- include/linux/resource.h | 1 + include/linux/security.h | 9 +- include/linux/sh_clk.h | 4 + include/linux/sh_intc.h | 2 +- include/linux/sh_timer.h | 1 - include/linux/sunrpc/svc_xprt.h | 18 +- include/linux/tty.h | 2 +- include/linux/usb.h | 2 +- include/linux/usb/musb.h | 2 + include/net/dn.h | 2 +- include/net/dst_ops.h | 1 + include/net/sock.h | 4 +- include/net/tcp.h | 6 +- include/net/udp.h | 4 +- include/scsi/libfc.h | 3 +- include/scsi/libiscsi.h | 3 +- include/scsi/libsas.h | 3 +- include/scsi/scsi_host.h | 23 +- include/trace/events/ext4.h | 97 ++ kernel/futex.c | 3 +- kernel/futex_compat.c | 3 +- kernel/latencytop.c | 17 +- kernel/perf_event.c | 42 +- kernel/printk.c | 21 +- kernel/range.c | 2 +- kernel/sysctl.c | 9 + kernel/trace/Kconfig | 2 +- kernel/trace/blktrace.c | 4 - lib/radix-tree.c | 83 ++- mm/filemap.c | 29 +- mm/memcontrol.c | 16 +- mm/mprotect.c | 2 +- mm/slub.c | 3 +- mm/vmscan.c | 2 +- net/ax25/af_ax25.c | 2 +- net/bluetooth/hci_event.c | 6 + net/bluetooth/hidp/Kconfig | 2 +- net/bluetooth/l2cap.c | 8 +- net/bluetooth/rfcomm/core.c | 13 +- net/can/bcm.c | 2 +- net/core/dst.c | 1 + net/core/filter.c | 64 +- net/core/pktgen.c | 6 +- net/core/rtnetlink.c | 9 +- net/core/sock.c | 14 +- net/decnet/af_decnet.c | 2 +- net/decnet/sysctl_net_decnet.c | 4 +- net/ipv4/igmp.c | 4 +- net/ipv4/proc.c | 8 +- net/ipv4/sysctl_net_ipv4.c | 5 +- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_input.c | 11 +- net/ipv4/tcp_ipv4.c | 8 +- net/ipv4/udp.c | 4 +- net/ipv6/addrconf.c | 24 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/ipv6/reassembly.c | 2 +- net/ipv6/route.c | 6 +- net/mac80211/iface.c | 6 +- net/packet/af_packet.c | 7 +- net/rds/message.c | 4 +- net/sched/cls_basic.c | 4 + net/sctp/protocol.c | 2 +- net/sctp/socket.c | 4 +- net/sctp/sysctl.c | 4 +- net/tipc/socket.c | 1 + net/wireless/nl80211.c | 4 +- net/x25/x25_facilities.c | 12 +- security/Kconfig | 12 + security/apparmor/lsm.c | 6 +- security/apparmor/policy.c | 2 +- security/capability.c | 5 + security/commoncap.c | 19 - security/security.c | 4 +- security/selinux/hooks.c | 6 +- security/smack/smack_lsm.c | 8 +- tools/perf/Documentation/perf-trace.txt | 57 +- tools/perf/builtin-record.c | 10 +- tools/perf/builtin-top.c | 12 +- tools/perf/builtin-trace.c | 209 +++-- tools/perf/scripts/perl/bin/failed-syscalls-record | 2 +- tools/perf/scripts/perl/bin/rw-by-file-record | 2 +- tools/perf/scripts/perl/bin/rw-by-pid-record | 2 +- tools/perf/scripts/perl/bin/rwtop-record | 2 +- tools/perf/scripts/perl/bin/wakeup-latency-record | 2 +- tools/perf/scripts/perl/bin/workqueue-stats-record | 2 +- .../python/bin/failed-syscalls-by-pid-record | 2 +- .../scripts/python/bin/futex-contention-record | 2 +- tools/perf/scripts/python/bin/netdev-times-record | 2 +- .../perf/scripts/python/bin/sched-migration-record | 2 +- tools/perf/scripts/python/bin/sctop-record | 2 +- .../python/bin/syscall-counts-by-pid-record | 2 +- .../perf/scripts/python/bin/syscall-counts-record | 2 +- tools/perf/util/ui/util.c | 5 +- 690 files changed, 11166 insertions(+), 5482 deletions(-) create mode 100644 Documentation/ABI/obsolete/proc-pid-oom_adj create mode 100644 Documentation/leds/leds-lp5521.txt create mode 100644 Documentation/leds/leds-lp5523.txt create mode 100644 arch/sh/boards/board-edosk7705.c rename arch/sh/boards/{mach-snapgear/setup.c => board-secureedge5410.c} (70%) delete mode 100644 arch/sh/boards/mach-edosk7705/Makefile delete mode 100644 arch/sh/boards/mach-edosk7705/io.c delete mode 100644 arch/sh/boards/mach-edosk7705/setup.c delete mode 100644 arch/sh/boards/mach-se/7206/io.c delete mode 100644 arch/sh/boards/mach-se/770x/io.c delete mode 100644 arch/sh/boards/mach-se/7751/io.c delete mode 100644 arch/sh/boards/mach-snapgear/Makefile delete mode 100644 arch/sh/boards/mach-snapgear/io.c delete mode 100644 arch/sh/boards/mach-systemh/Makefile delete mode 100644 arch/sh/boards/mach-systemh/io.c delete mode 100644 arch/sh/boards/mach-systemh/irq.c delete mode 100644 arch/sh/boards/mach-systemh/setup.c rename arch/sh/configs/{snapgear_defconfig => secureedge5410_defconfig} (100%) delete mode 100644 arch/sh/configs/systemh_defconfig delete mode 100644 arch/sh/include/mach-common/mach/edosk7705.h rename arch/sh/include/mach-common/mach/{snapgear.h => secureedge5410.h} (79%) delete mode 100644 arch/sh/include/mach-common/mach/systemh7751.h create mode 100644 drivers/leds/leds-lp5521.c create mode 100644 drivers/leds/leds-lp5523.c delete mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h delete mode 100644 drivers/staging/tidspbridge/core/dsp-mmu.c create mode 100644 drivers/staging/tidspbridge/hw/EasiGlobal.h create mode 100644 drivers/staging/tidspbridge/hw/MMUAccInt.h create mode 100644 drivers/staging/tidspbridge/hw/MMURegAcM.h create mode 100644 drivers/staging/tidspbridge/hw/hw_defs.h create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.c create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.h create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dmm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dsp-mmu.h create mode 100644 drivers/staging/tidspbridge/pmgr/dmm.c create mode 100644 drivers/tty/Makefile rename drivers/{char => tty}/n_gsm.c (99%) rename drivers/{char => tty}/n_hdlc.c (100%) rename drivers/{char => tty}/n_r3964.c (100%) rename drivers/{char => tty}/n_tty.c (100%) rename drivers/{char => tty}/pty.c (100%) rename drivers/{char => tty}/sysrq.c (100%) rename drivers/{char => tty}/tty_audit.c (100%) rename drivers/{char => tty}/tty_buffer.c (97%) rename drivers/{char => tty}/tty_io.c (100%) rename drivers/{char => tty}/tty_ioctl.c (100%) rename drivers/{char => tty}/tty_ldisc.c (95%) rename drivers/{char => tty}/tty_mutex.c (100%) rename drivers/{char => tty}/tty_port.c (100%) rename drivers/{char => tty/vt}/.gitignore (100%) create mode 100644 drivers/tty/vt/Makefile rename drivers/{char => tty/vt}/consolemap.c (100%) rename drivers/{char => tty/vt}/cp437.uni (100%) rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%) rename drivers/{char => tty/vt}/defkeymap.map (100%) rename drivers/{char => tty/vt}/keyboard.c (100%) rename drivers/{char => tty/vt}/selection.c (100%) rename drivers/{char => tty/vt}/vc_screen.c (99%) rename drivers/{char => tty/vt}/vt.c (100%) rename drivers/{char => tty/vt}/vt_ioctl.c (100%) create mode 100644 include/linux/atomic.h create mode 100644 include/linux/leds-lp5521.h create mode 100644 include/linux/leds-lp5523.h create mode 100644 include/linux/printk.h ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Merge made by recursive. block/blk-throttle.c | 2 +- drivers/block/amiflop.c | 2 +- drivers/block/ataflop.c | 2 +- drivers/block/cciss.c | 3 +- drivers/block/xen-blkfront.c | 55 +++++++++++++++++++++++++---------------- fs/ioprio.c | 31 ++++------------------- 6 files changed, 43 insertions(+), 52 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Already up-to-date! Merge made by recursive. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Merge made by recursive. Documentation/DocBook/uio-howto.tmpl | 6 +- Documentation/development-process/2.Process | 33 +++++-- .../configfs/configfs_example_explicit.c | 2 +- Documentation/gpio.txt | 10 ++ Documentation/hwmon/lm93 | 2 +- Documentation/hwmon/max6650 | 2 +- Documentation/power/opp.txt | 3 + MAINTAINERS | 2 + arch/blackfin/kernel/process.c | 1 - arch/frv/kernel/process.c | 1 - arch/h8300/kernel/process.c | 1 - arch/m68k/kernel/process.c | 1 - arch/m68knommu/kernel/process.c | 1 - arch/mn10300/kernel/process.c | 1 - arch/parisc/hpux/sys_hpux.c | 1 - arch/parisc/kernel/sys_parisc32.c | 1 - arch/powerpc/Kconfig | 4 + arch/powerpc/boot/div64.S | 3 +- arch/powerpc/kernel/kgdb.c | 4 +- arch/powerpc/kernel/setup_64.c | 5 +- arch/powerpc/kernel/sys_ppc32.c | 1 - arch/powerpc/mm/hash_utils_64.c | 2 +- arch/powerpc/mm/tlb_low_64e.S | 5 +- arch/powerpc/mm/tlb_nohash.c | 2 +- arch/powerpc/platforms/pseries/Kconfig | 6 + arch/powerpc/platforms/pseries/eeh.c | 2 - arch/powerpc/platforms/pseries/pci_dlpar.c | 2 - arch/s390/kernel/compat_linux.c | 1 - arch/sparc/kernel/leon_smp.c | 1 - arch/sparc/kernel/sys_sparc32.c | 1 - arch/sparc/kernel/sys_sparc_32.c | 1 - arch/sparc/kernel/unaligned_32.c | 1 - arch/sparc/kernel/windows.c | 1 - arch/tile/kernel/compat.c | 1 - arch/tile/kernel/compat_signal.c | 1 - arch/tile/kernel/signal.c | 1 - arch/tile/kernel/smpboot.c | 1 - arch/tile/kernel/sys.c | 1 - arch/tile/mm/fault.c | 1 - arch/tile/mm/hugetlbpage.c | 1 - arch/um/kernel/exec.c | 1 - arch/x86/ia32/sys_ia32.c | 1 - arch/x86/kernel/cpuid.c | 1 - arch/x86/kernel/kgdb.c | 12 ++- arch/x86/kernel/msr.c | 1 - arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 19 ++-- block/compat_ioctl.c | 1 - block/ioctl.c | 1 - drivers/ata/libata-scsi.c | 21 ++--- drivers/ata/sata_via.c | 9 +- drivers/base/power/main.c | 34 ++++++- drivers/block/drbd/drbd_receiver.c | 1 - drivers/block/drbd/drbd_worker.c | 1 - drivers/char/agp/frontend.c | 1 - drivers/char/amiserial.c | 1 - drivers/char/briq_panel.c | 1 - drivers/char/hpet.c | 1 - drivers/char/hw_random/core.c | 1 - drivers/char/istallion.c | 1 - drivers/char/serial167.c | 1 - drivers/char/specialix.c | 1 - drivers/char/stallion.c | 1 - drivers/char/sx.c | 1 - drivers/char/uv_mmtimer.c | 1 - drivers/gpu/drm/drm_fops.c | 1 - drivers/hid/hidraw.c | 1 - drivers/hid/usbhid/hiddev.c | 1 - drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - drivers/input/input.c | 1 - drivers/input/serio/serio_raw.c | 1 - drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 - drivers/media/dvb/dvb-core/dvb_frontend.c | 1 - drivers/media/dvb/ngene/ngene-core.c | 1 - drivers/media/dvb/ngene/ngene-dvb.c | 1 - drivers/media/dvb/ngene/ngene-i2c.c | 1 - drivers/media/radio/radio-mr800.c | 1 - drivers/media/radio/si470x/radio-si470x.h | 1 - drivers/media/video/bt8xx/bttv-driver.c | 1 - drivers/media/video/cx88/cx88-blackbird.c | 1 - drivers/media/video/cx88/cx88-video.c | 1 - drivers/media/video/pwc/pwc-if.c | 1 - drivers/media/video/s2255drv.c | 1 - drivers/media/video/saa7134/saa7134-empress.c | 1 - drivers/media/video/saa7164/saa7164.h | 1 - drivers/media/video/usbvision/usbvision-video.c | 1 - drivers/media/video/v4l2-compat-ioctl32.c | 1 - drivers/net/wireless/orinoco/orinoco_usb.c | 1 - drivers/parisc/eisa_eeprom.c | 1 - drivers/pci/proc.c | 1 - drivers/pnp/isapnp/proc.c | 1 - drivers/s390/block/dasd_eer.c | 1 - drivers/s390/char/fs3270.c | 1 - drivers/s390/char/tape_char.c | 1 - drivers/s390/char/vmlogrdr.c | 1 - drivers/s390/char/vmur.c | 1 - drivers/s390/crypto/zcrypt_api.c | 1 - drivers/scsi/hpsa.c | 1 - drivers/scsi/pm8001/pm8001_sas.h | 1 - drivers/scsi/sd.c | 1 - drivers/serial/crisv10.c | 1 - drivers/serial/serial_core.c | 1 - drivers/staging/easycap/easycap.h | 1 - .../staging/intel_sst/intel_sst_app_interface.c | 1 - drivers/staging/rtl8712/osdep_service.h | 1 - drivers/staging/speakup/buffers.c | 1 - drivers/staging/stradis/Kconfig | 2 +- drivers/usb/core/devices.c | 1 - drivers/usb/core/devio.c | 1 - drivers/usb/core/file.c | 1 - drivers/usb/core/inode.c | 1 - drivers/usb/gadget/f_fs.c | 1 - drivers/usb/gadget/f_hid.c | 1 - drivers/usb/host/isp1362-hcd.c | 1 - drivers/usb/host/uhci-debug.c | 1 - drivers/usb/mon/mon_bin.c | 1 - drivers/usb/mon/mon_stat.c | 1 - drivers/usb/serial/usb-serial.c | 1 - drivers/video/console/vgacon.c | 1 - drivers/xen/xenfs/privcmd.c | 1 - drivers/zorro/proc.c | 1 - fs/block_dev.c | 1 - fs/ceph/inode.c | 1 - fs/ceph/mds_client.c | 1 - fs/compat_ioctl.c | 1 - fs/ecryptfs/super.c | 1 - fs/ext3/super.c | 1 - fs/ioctl.c | 1 - fs/lockd/clntlock.c | 1 - fs/lockd/clntproc.c | 1 - fs/lockd/host.c | 11 +-- fs/lockd/svc4proc.c | 1 - fs/lockd/svclock.c | 1 - fs/lockd/svcproc.c | 1 - fs/locks.c | 1 - fs/namespace.c | 1 - fs/ncpfs/dir.c | 1 - fs/ncpfs/file.c | 1 - fs/ncpfs/inode.c | 1 - fs/ncpfs/ioctl.c | 1 - fs/nfs/callback.c | 1 - fs/nfs/delegation.c | 1 - fs/nfs/dir.c | 100 +++++++++++++------- fs/nfs/nfs2xdr.c | 4 +- fs/nfs/nfs3xdr.c | 4 +- fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4xdr.c | 2 +- fs/nfs/super.c | 9 ++- fs/nfsd/nfs4state.c | 8 +- fs/ocfs2/super.c | 1 - fs/proc/inode.c | 1 - fs/read_write.c | 1 - fs/reiserfs/inode.c | 1 - fs/reiserfs/ioctl.c | 1 - fs/reiserfs/journal.c | 1 - fs/reiserfs/super.c | 1 - include/linux/hardirq.h | 6 +- include/linux/lockd/lockd.h | 1 + include/linux/nfs_fs.h | 6 - include/linux/reiserfs_fs.h | 1 - include/linux/sched.h | 1 + include/linux/smp_lock.h | 3 - include/linux/tty.h | 1 - init/main.c | 1 - kernel/debug/kdb/kdb_main.c | 21 ++-- kernel/kallsyms.c | 2 +- kernel/pm_qos_params.c | 4 +- kernel/power/Kconfig | 4 + kernel/sched.c | 39 ++++++-- kernel/sched_fair.c | 40 ++++++-- kernel/sched_stoptask.c | 4 +- kernel/trace/trace.c | 1 - net/irda/af_irda.c | 1 - net/irda/irnet/irnet_ppp.c | 1 - net/sunrpc/stats.c | 4 +- net/sunrpc/svc_xprt.c | 1 - scripts/kernel-doc | 12 ++- sound/core/info.c | 1 - sound/core/pcm_native.c | 1 - sound/core/sound.c | 1 - sound/sound_core.c | 1 - 181 files changed, 310 insertions(+), 307 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Merge made by recursive. drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 528 +++++++++++++++++++++++++++++++++++ drivers/ata/ahci.h | 3 + drivers/ata/libahci.c | 11 +- drivers/ata/libata-scsi.c | 60 ++--- drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- include/linux/libata.h | 6 +- 9 files changed, 574 insertions(+), 48 deletions(-) create mode 100644 drivers/ata/acard-ahci.c ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-change-clone-bi_private-pointer-during-cleanup.patch dm-delay-unplug-queue.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-extract-region_hash.patch dm-flakey.patch dm-handle-clone-reprocessing.patch dm-ioctl-allow-rename-to-fill-empty-uuid.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-improve-err-mesgs.patch dm-mpath-pg_timeout.patch dm-mpath-refactor-pg_init-trigger.patch dm-multisnap-common.patch dm-multisnap-daniel.patch dm-multisnap-mikulas-alloc.patch dm-multisnap-mikulas-blocks.patch dm-multisnap-mikulas-btree.patch dm-multisnap-mikulas-commit.patch dm-multisnap-mikulas-common.patch dm-multisnap-mikulas-config.patch dm-multisnap-mikulas-delete.patch dm-multisnap-mikulas-freelist.patch dm-multisnap-mikulas-headers.patch dm-multisnap-mikulas-io.patch dm-multisnap-mikulas-snaps.patch dm-raid1-clear-region_hash-on-suspend.patch dm-raid1-increase-dm-io-pages.patch dm-raid1-mempool-bug-workaround-reversion.patch dm-raid1-read-balancing.patch dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch dm-raid45-to-be-split.patch dm-region_hash-change-primes.patch dm-remove-struct-clone_info.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-split-bios-into-only-two-pieces.patch dm-table-extend-device-name-lookups.patch dm-table-limit-max_segments-when-no-merge_bvec-fn.patch dm-throttle.patch dm-tidy-io-initialisation-functions.patch dm-use-singlethread-workqueues.patch dm-userspace.patch end git-update1.patch mm next next-20101013.patch series series.html uml-fixes.patch v6-1-4-dm-replicator-documentation-and-module-registry.patch v6-2-4-dm-replicator-replication-log-and-site-link-handler-interfaces-and-main-replicator-module.patch v6-3-4-dm-replicator-ringbuffer-replication-log-handler.patch v6-4-4-dm-replicator-blockdev-site-link-handler.patch sent 59188301 bytes received 1212 bytes 39459675.33 bytes/sec total size is 59175123 speedup is 1.00 Using base scsi-misc ## # gitrebase /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git master scsi-post-merge merge-base ## First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge to 2.6.37-rc1-stor14. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.37-rc1-stor14 66e669a] 2.6.37-rc1-stor14 Committer: James Bottomley Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name ' 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/storage-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/storage-tree/log- ##