Checking out files: 3% (39/1075) Checking out files: 4% (43/1075) Checking out files: 5% (54/1075) Checking out files: 6% (65/1075) Checking out files: 7% (76/1075) Checking out files: 7% (77/1075) Checking out files: 8% (86/1075) Checking out files:Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Removing drivers/md/.gitignore Removing drivers/pci/pcie/pme/Makefile Removing drivers/pci/pcie/pme/pcie_pme.h Removing drivers/pci/pcie/pme/pcie_pme_acpi.c Auto-merging drivers/scsi/qla2xxx/qla_attr.c Auto-merging drivers/scsi/qla2xxx/qla_def.h Auto-merging drivers/scsi/qla2xxx/qla_init.c Auto-merging drivers/scsi/qla2xxx/qla_isr.c Auto-merging drivers/scsi/qla2xxx/qla_mbx.c Auto-merging drivers/scsi/qla2xxx/qla_nx.c Auto-merging drivers/scsi/qla2xxx/qla_os.c Auto-merging drivers/scsi/sd.c Merge made by recursive. Documentation/DocBook/device-drivers.tmpl | 1 - Documentation/DocBook/kernel-api.tmpl | 1 - Documentation/DocBook/kernel-locking.tmpl | 6 + Documentation/DocBook/tracepoint.tmpl | 5 + Documentation/block/cfq-iosched.txt | 45 +++ Documentation/cgroups/blkio-controller.txt | 28 ++ Documentation/gpio.txt | 22 +- Documentation/kernel-doc-nano-HOWTO.txt | 5 + Documentation/kernel-parameters.txt | 17 +- Documentation/mutex-design.txt | 3 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + MAINTAINERS | 36 ++- Makefile | 2 +- arch/alpha/include/asm/cache.h | 1 - arch/alpha/kernel/err_marvel.c | 6 +- arch/alpha/kernel/perf_event.c | 18 +- arch/alpha/kernel/proto.h | 3 - arch/alpha/kernel/sys_cabriolet.c | 19 +- arch/alpha/kernel/sys_takara.c | 11 +- arch/arm/Kconfig | 90 ----- arch/arm/boot/Makefile | 8 +- arch/arm/boot/compressed/Makefile | 4 + arch/arm/boot/compressed/head.S | 2 +- arch/arm/common/it8152.c | 8 + arch/arm/include/asm/dma-mapping.h | 8 - arch/arm/include/asm/perf_event.h | 2 +- arch/arm/include/asm/unistd.h | 3 + arch/arm/kernel/calls.S | 3 + arch/arm/kernel/perf_event.c | 12 +- arch/arm/mach-at91/at91sam9g45.c | 15 +- arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- arch/arm/mach-at91/board-sam9261ek.c | 31 +- arch/arm/mach-at91/clock.c | 3 +- arch/arm/mach-ep93xx/clock.c | 2 +- arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx25/mach-cpuimx25.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 77 +++- arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx3/mach-cpuimx35.c | 4 +- arch/arm/mach-mx5/clock-mx51.c | 2 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 +- arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 +- arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 4 +- arch/arm/mach-shmobile/Makefile | 2 +- arch/arm/mach-shmobile/board-ap4evb.c | 56 ++- arch/arm/mach-shmobile/clock-sh7372.c | 9 +- arch/arm/mach-shmobile/clock.c | 4 +- arch/arm/mach-shmobile/pm_runtime.c | 169 ++++++++ arch/arm/mm/Kconfig | 2 +- arch/arm/mm/dma-mapping.c | 2 + arch/arm/plat-mxc/Kconfig | 1 + arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +- arch/arm/plat-mxc/tzic.c | 5 +- arch/arm/plat-pxa/pwm.c | 2 +- arch/arm/tools/mach-types | 98 +++++- arch/h8300/include/asm/atomic.h | 15 +- arch/h8300/include/asm/system.h | 4 +- arch/h8300/kernel/sys_h8300.c | 4 +- arch/h8300/kernel/traps.c | 2 +- arch/ia64/include/asm/compat.h | 2 +- arch/ia64/kernel/fsys.S | 46 ++- arch/m68k/include/asm/unistd.h | 5 +- arch/m68k/kernel/entry.S | 3 + arch/m68knommu/kernel/syscalltable.S 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: 2% (55/1873) Checking out files: 3% (57/1873) Checking out files: 4% (75/1873) Checking out files: 5% (94/1873) Checking out files: 6% (113/1873) Checking out files: 7% (132/1873) Checking out files: 7% (140/1873) Checking out files: 8% (150/1873) Checking out files: 9% (169/1873) Checking out files: 10% (188/1873) Checking out files: 11% (207/1873) Checking out files: 12% (225/1873) Checking out files: 13% (244/1873) Checking out files: 13% (247/1873) Checking out files: 14% (263/1873) Checking out files: 15% (281/1873) Checking out files: 16% (300/1873) Checking out files: 17% (319/1873) Checking out files: 18% (338/1873) Checking out files: 19% (356/1873) Checking out files: 19% (373/1873) Checking out files: 20% (375/1873) Checking out files: 21% (394/1873) Checking out files: 22% (413/1873) Checking out files: 23% (431/1873) Checking out files: 24% (450/1873) Checking out files: 25% (469/1873) Checking out files: 26% (487/1873) Checking out files: 26% (501/1873) Checking out files: 27% (506/1873) Checking out files: 28% (525/1873) Checking out files: 29% (544/1873) Checking out files: 30% (562/1873) Checking out files: 30% (564/1873) Checking out files: 31% (581/1873) Checking out files: 31% (587/1873) Checking out files: 32% (600/1873) Checking out files: 33% (619/1873) Checking out files: 34% (637/1873) Checking out files: 35% (656/1873) Checking out files: 35% (669/1873) Checking out files: 36% (675/1873) Checking out files: 37% (694/1873) Checking out files: 38% (712/1873) Checking out files: 39% (731/1873) Checking out files: 40% (750/1873) Checking out files: 40% (764/1873) Checking out files: 41% (768/1873) Checking out files: 42% (787/1873) Checking out files: 43% (806/1873) Checking out files: 44% (825/1873) Checking out files: 44% (837/1873) Checking out files: 45% (843/1873) Checking out files: 46% (862/1873) Checking out files: 46% (872/1873) Checking out files: 47% (881/1873) Checking out files: 48% (900/1873) Checking out files: 48% (908/1873) Checking out files: 49% (918/1873) Checking out files: 50% (937/1873) Checking out files: 51% (956/1873) Checking out files: 51% (968/1873) Checking out files: 52% (974/1873) Checking out files: 52% (985/1873) Checking out files: 53% (993/1873) Checking out files: 54% (1012/1873) Checking out files: 55% (1031/1873) Checking out files: 56% (1049/1873) Checking out files: 57% (1068/1873) Checking out files: 58% (1087/1873) Checking out files: 59% (1106/1873) Checking out files: 60% (1124/1873) Checking out files: 61% (1143/1873) Checking out files: 62% (1162/1873) Checking out files: 63% (1180/1873) Checking out files: 64% (1199/1873) Checking out files: 64% (1208/1873) Checking out files: 65% (1218/1873) Checking out files: 66% (1237/1873) Checking out files: 66% (1254/1873) Checking out files: 67% (1255/1873) Checking out files: 68% (1274/1873) Checking out files: 69% (1293/1873) Checking out files: 70% (1312/1873) Checking out files: 70% (1317/1873) Checking out files: 71% (1330/1873) Checking out files: 72% (1349/1873) Checking out files: 73% (1368/1873) Checking out files: 73% (1370/1873) Checking out files: 74% (1387/1873) Checking out files: 75% (1405/1873) Checking out files: 76% (1424/1873) Checking out files: 76% (1428/1873) Checking out files: 77% (1443/1873) Checking out files: 78% (1461/1873) Checking out files: 79% (1480/1873) Checking out files: 80% (1499/1873) Checking out files: 81% (1518/1873) Checking out files: 82% (1536/1873) Checking out files: 82% (1537/1873) Checking out files: 83% (1555/1873) Checking out files: 84% (1574/1873) Checking out files: 85% (1593/1873) Checking out files: 86% (1611/1873) Checking out files: 86% (1618/1873) Checking out files: 87% (1630/1873) Checking out files: 88% (1649/1873) Checking out files: 89% (1667/1873) Checking out files: 90% (1686/1873) Checking out files: 90% (1695/1873) Checking out files: 91% (1705/1873) Checking out files: 92% (1724/1873) Checking out files: 93% (1742/1873) Checking out files: 94% (1761/1873) Checking out files: 95% (1780/1873) Checking out files: 95% (1783/1873) Checking out files: 96% (1799/1873) Checking out files: 97% (1817/1873) Checking out files: 98% (1836/1873) Checking out files: 99% (1855/1873) Checking out files: 100% (1873/1873) Checking out files: 100% (1873/1873), done. Switched to branch 'device-mapper' Checking out files: 21% (407/1873) Checking out files: 22% (413/1873) Checking out files: 23% (431/1873) Checking out files: 24% (450/1873) Checking out files: 24% (466/1873) Checking out files: 25% (469/1873) Checking out files: 26% (487/1873) Checking out files: 27% (506/1873) Checking out files: 28% (525/1873) Checking out files: 29% (544/1873) Checking out files: 30% (562/1873) Checking out files: 31% (581/1873) Checking out files: 32% (600/1873) Checking out files: 33% (619/1873) Checking out files: 33% (634/1873) Checking out files: 34% (637/1873) Checking out files: 35% (656/1873) Checking out files: 36% (675/1873) Checking out files: 37% (694/1873) Checking out files: 38% (712/1873) Checking out files: 38% (717/1873) Checking out files: 39% (731/1873) Checking out files: 40% (750/1873) Checking out files: 41% (768/1873) Checking out files: 42% (787/1873) Checking out files: 43% (806/1873) Checking out files: 44% (825/1873) Checking out files: 45% (843/1873) Checking out files: 45% (844/1873) Checking out files: 46% (862/1873) Checking out files: 47% (881/1873) Checking out files: 48% (900/1873) Checking out files: 49% (918/1873) Checking out files: 50% (937/1873) Checking out files: 51% (956/1873) Checking out files: 52% (974/1873) Checking out files: 53% (993/1873) Checking out files: 53% (1004/1873) Checking out files: 54% (1012/1873) Checking out files: 55% (1031/1873) Checking out files: 56% (1049/1873) Checking out files: 56% (1058/1873) Checking out files: 57% (1068/1873) Checking out files: 58% (1087/1873) Checking out files: 59% (1106/1873) Checking out files: 60% (1124/1873) Checking out files: 61% (1143/1873) Checking out files: 61% (1155/1873) Checking out files: 61% (1161/1873) Checking out files: 62% (1162/1873) Checking out files: 62% (1168/1873) Checking out files: 63% (1180/1873) Checking out files: 64% (1199/1873) Checking out files: 64% (1216/1873) Checking out files: 65% (1218/1873) Checking out files: 66% (1237/1873) Checking out files: 67% (1255/1873) Checking out files: 68% (1274/1873) Checking out files: 69% (1293/1873) Checking out files: 70% (1312/1873) Checking out files: 71% (1330/1873) Checking out files: 72% (1349/1873) Checking out files: 73% (1368/1873) Checking out files: 74% (1387/1873) Checking out files: 75% (1405/1873) Checking out files: 76% (1424/1873) Checking out files: 76% (1442/1873) Checking out files: 77% (1443/1873) Checking out files: 78% (1461/1873) Checking out files: 78% (1473/1873) Checking out files: 79% (1480/1873) Checking out files: 80% (1499/1873) Checking out files: 81% (1518/1873) Checking out files: 82% (1536/1873) Checking out files: 83% (1555/1873) Checking out files: 84% (1574/1873) Checking out files: 85% (1593/1873) Checking out files: 86% (1611/1873) Checking out files: 86% (1619/1873) Checking out files: 87% (1630/1873) Checking out files: 88% (1649/1873) Checking out files: 89% (1667/1873) Checking out files: 90% (1686/1873) Checking out files: 91% (1705/1873) Checking out files: 92% (1724/1873) Checking out files: 93% (1742/1873) Checking out files: 94% (1761/1873) Checking out files: 95% (1780/1873) Checking out files: 96% (1799/1873) Checking out files: 97% (1817/1873) Checking out files: 97% (1828/1873) Checking out files: 98% (1836/1873) Checking out files: 99% (1855/1873) Checking out files: 100% (1873/1873) Checking out files: 100% (1873/1873), done. Switched to branch '2.6.36-rc3-stor31' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 4c79f4b...2bfc96a master -> scsi-post-merge (forced update) Checking out files: 12% (177/1374) Checking out files: 13% (179/1374) Checking out files: 14% (193/1374) Checking out files: 15% (207/1374) Checking out files: 16% (220/1374) Checking out files: 17% (234/1374) Checking out files: 18% (248/1374) Checking out files: 19% (262/1374) Checking out files: 20% (275/1374) Checking out files: 21% (289/1374) Checking out files: 22% (303/1374) Checking out files: 23% (317/1374) Checking out files: 24% (330/1374) Checking out files: 25% (344/1374) Checking out files: 26% (358/1374) Checking out files: 26% (365/1374) Checking out files: 27% (371/1374) Checking out files: 28% (385/1374) Checking out files: 29% (399/1374) Checking out files: 30% (413/1374) Checking out files: 31% (426/1374) Checking out files: 32% (440/1374) Checking out files: 33% (454/1374) Checking out files: 34% (468/1374) Checking out files: 35% (481/1374) Checking out files: 36% (495/1374) Checking out files: 37% (509/1374) Checking out files: 38% (523/1374) Checking out files: 39% (536/1374) Checking out files: 39% (545/1374) Checking out files: 40% (550/1374) Checking out files: 41% (564/1374) Checking out files: 42% (578/1374) Checking out files: 43% (591/1374) Checking out files: 44% (605/1374) Checking out files: 45% (619/1374) Checking out files: 46% (633/1374) Checking out files: 47% (646/1374) Checking out files: 48% (660/1374) Checking out files: 49% (674/1374) Checking out files: 50% (687/1374) Checking out files: 51% (701/1374) Checking out files: 52% (715/1374) Checking out files: 52% (716/1374) Checking out files: 53% (729/1374) Checking out files: 54% (742/1374) Checking out files: 55% (756/1374) Checking out files: 56% (770/1374) Checking out files: 57% (784/1374) Checking out files: 58% (797/1374) Checking out files: 59% (811/1374) Checking out files: 60% (825/1374) Checking out files: 61% (839/1374) Checking out files: 62% (852/1374) Checking out files: 63% (866/1374) Checking out files: 64% (880/1374) Checking out files: 65% (894/1374) Checking out files: 66% (907/1374) Checking out files: 66% (915/1374) Checking out files: 67% (921/1374) Checking out files: 68% (935/1374) Checking out files: 69% (949/1374) Checking out files: 70% (962/1374) Checking out files: 71% (976/1374) Checking out files: 72% (990/1374) Checking out files: 73% (1004/1374) Checking out files: 74% (1017/1374) Checking out files: 75% (1031/1374) Checking out files: 76% (1045/1374) Checking out files: 77% (1058/1374) Checking out files: 78% (1072/1374) Checking out files: 79% (1086/1374) Checking out files: 80% (1100/1374) Checking out files: 81% (1113/1374) Checking out files: 82% (1127/1374) Checking out files: 83% (1141/1374) Checking out files: 84% (1155/1374) Checking out files: 85% (1168/1374) Checking out files: 86% (1182/1374) Checking out files: 87% (1196/1374) Checking out files: 88% (1210/1374) Checking out files: 89% (1223/1374) Checking out files: 89% (1225/1374) Checking out files: 90% (1237/1374) Checking out files: 91% (1251/1374) Checking out files: 92% (1265/1374) Checking out files: 93% (1278/1374) Checking out files: 94% (1292/1374) Checking out files: 95% (1306/1374) Checking out files: 96% (1320/1374) Checking out files: 97% (1333/1374) Checking out files: 98% (1347/1374) Checking out files: 99% (1361/1374) Checking out files: 100% (1374/1374) Checking out files: 100% (1374/1374), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.36-rc3-stor31' From . * branch scsi-post-merge -> FETCH_HEAD bfin_sport_uart.c | 2 +- drivers/serial/mpc52xx_uart.c | 1 + drivers/spi/amba-pl022.c | 16 +- drivers/spi/dw_spi.c | 24 +- drivers/spi/spi.c | 9 +- drivers/spi/spi_s3c64xx.c | 37 ++- drivers/staging/comedi/drivers/das08_cs.c | 1 - drivers/staging/hv/netvsc_drv.c | 3 + drivers/staging/hv/ring_buffer.c | 3 +- drivers/staging/hv/storvsc_api.h | 4 +- drivers/staging/hv/storvsc_drv.c | 11 +- drivers/staging/octeon/Kconfig | 2 +- drivers/staging/rt2860/usb_main_dev.c | 41 ++- drivers/staging/spectra/Kconfig | 1 + drivers/staging/spectra/ffsport.c | 1 + drivers/staging/wlan-ng/cfg80211.c | 3 + drivers/staging/zram/zram_drv.c | 1 + drivers/usb/atm/cxacru.c | 24 +- drivers/usb/class/cdc-acm.c | 23 +- drivers/usb/core/message.c | 22 +- drivers/usb/gadget/rndis.c | 12 +- drivers/usb/gadget/rndis.h | 2 +- drivers/usb/gadget/s3c-hsotg.c | 2 - drivers/usb/host/ehci-ppc-of.c | 12 +- drivers/usb/serial/cp210x.c | 11 +- drivers/usb/serial/ftdi_sio.c | 8 + drivers/usb/serial/ftdi_sio_ids.h | 12 + drivers/usb/serial/mos7840.c | 32 +- drivers/usb/serial/option.c | 119 ++++-- drivers/usb/serial/ssu100.c | 2 +- drivers/vhost/vhost.c | 85 +++-- drivers/video/pxa168fb.c | 6 +- fs/9p/fid.c | 3 +- fs/9p/vfs_dir.c | 6 +- fs/9p/vfs_inode.c | 9 +- fs/9p/vfs_super.c | 20 +- fs/aio.c | 3 + fs/binfmt_misc.c | 2 +- fs/bio-integrity.c | 4 +- fs/cifs/Kconfig | 2 - fs/cifs/asn1.c | 6 +- fs/cifs/cifsencrypt.c | 418 ++++---------------- fs/cifs/cifsglob.h | 25 +-- fs/cifs/cifspdu.h | 7 +- fs/cifs/cifsproto.h | 13 +- fs/cifs/cifssmb.c | 13 +- fs/cifs/connect.c | 71 +--- fs/cifs/inode.c | 30 +- fs/cifs/netmisc.c | 22 +- fs/cifs/ntlmssp.h | 13 - fs/cifs/sess.c | 132 ++----- fs/cifs/transport.c | 6 +- fs/direct-io.c | 4 +- fs/exec.c | 14 + fs/fcntl.c | 10 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 42 ++- fs/fuse/file.c | 8 +- fs/minix/namei.c | 2 +- fs/namespace.c | 23 +- fs/nfs/Kconfig | 1 + fs/nfs/client.c | 2 +- fs/nfs/file.c | 4 - fs/nfs/super.c | 10 +- fs/nfsd/Kconfig | 1 + fs/nfsd/nfs4state.c | 2 +- fs/nilfs2/the_nilfs.c | 1 + fs/ocfs2/alloc.c | 2 +- fs/ocfs2/blockcheck.c | 4 +- fs/ocfs2/file.c | 15 +- fs/ocfs2/inode.c | 6 +- fs/ocfs2/mmap.c | 8 +- fs/ocfs2/namei.c | 302 +++++++++++---- fs/ocfs2/refcounttree.c | 5 +- fs/ocfs2/suballoc.c | 219 +++++++++-- fs/ocfs2/suballoc.h | 21 + fs/proc/page.c | 2 +- fs/proc/task_mmu.c | 3 +- fs/sysfs/file.c | 2 +- fs/xfs/linux-2.6/xfs_buf.c | 11 +- fs/xfs/linux-2.6/xfs_buf.h | 1 - fs/xfs/linux-2.6/xfs_ioctl.c | 9 + fs/xfs/linux-2.6/xfs_iops.c | 2 +- fs/xfs/xfs_bmap.c | 14 +- fs/xfs/xfs_fs.h | 4 +- fs/xfs/xfs_vnodeops.c | 13 +- include/acpi/acpi_bus.h | 3 - include/asm-generic/gpio.h | 14 +- include/asm-generic/percpu.h | 15 +- include/linux/acpi.h | 4 +- include/linux/cgroup.h | 12 +- include/linux/compat.h | 3 + include/linux/elevator.h | 1 + include/linux/gpio.h | 1 + include/linux/i2c/sx150x.h | 4 + include/linux/intel-gtt.h | 20 + include/linux/io-mapping.h | 24 +- include/linux/kfifo.h | 58 ++-- include/linux/ksm.h | 20 +- include/linux/lglock.h | 4 +- include/linux/libata.h | 4 +- include/linux/mm.h | 6 + include/linux/mmc/sdio.h | 2 + include/linux/mmzone.h | 13 + include/linux/mutex.h | 8 + include/linux/pci.h | 3 + include/linux/pci_ids.h | 2 + include/linux/percpu.h | 2 +- include/linux/quotaops.h | 10 +- include/linux/semaphore.h | 3 + include/linux/serial.h | 3 +- include/linux/serial_core.h | 3 +- include/linux/spi/dw_spi.h | 2 + include/linux/sunrpc/clnt.h | 2 +- include/linux/swap.h | 11 +- include/linux/vmstat.h | 22 + include/linux/workqueue.h | 18 +- include/net/cls_cgroup.h | 10 +- include/net/ip_vs.h | 3 + include/net/sock.h | 1 + include/net/udp.h | 1 + kernel/cgroup.c | 13 +- kernel/compat.c | 21 + kernel/debug/kdb/kdb_bp.c | 2 - kernel/gcov/fs.c | 244 +++++++++--- kernel/groups.c | 5 +- kernel/hrtimer.c | 3 +- kernel/mutex.c | 23 +- kernel/perf_event.c | 32 ++- kernel/pm_qos_params.c | 4 +- kernel/power/hibernate.c | 1 - kernel/power/snapshot.c | 86 +++- kernel/power/swap.c | 6 +- kernel/sched.c | 6 + kernel/sched_fair.c | 11 +- kernel/sys.c | 2 + kernel/sysctl.c | 5 +- kernel/trace/ftrace.c | 19 +- kernel/trace/ring_buffer.c | 2 - kernel/trace/trace_event_perf.c | 3 + kernel/trace/trace_kprobe.c | 43 ++- kernel/watchdog.c | 17 +- kernel/workqueue.c | 53 ++- lib/raid6/.gitignore | 4 + lib/scatterlist.c | 14 +- mm/Kconfig | 2 +- mm/backing-dev.c | 7 +- mm/bounce.c | 2 +- mm/compaction.c | 7 +- mm/ksm.c | 3 - mm/memory.c | 39 ++- mm/memory_hotplug.c | 16 +- mm/mlock.c | 6 - mm/mmzone.c | 21 + mm/page_alloc.c | 33 ++- mm/percpu.c | 6 +- mm/percpu_up.c | 4 +- mm/swapfile.c | 129 +++---- mm/vmstat.c | 16 +- net/9p/client.c | 7 +- net/bridge/br_netfilter.c | 6 +- net/core/dev.c | 16 +- net/core/gen_estimator.c | 12 +- net/core/skbuff.c | 6 +- net/ipv4/Kconfig | 2 +- net/ipv4/datagram.c | 5 +- net/ipv4/fib_frontend.c | 15 +- net/ipv4/fib_trie.c | 8 +- net/ipv4/route.c | 7 +- net/ipv4/udp.c | 44 ++ net/ipv6/datagram.c | 7 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 80 +--- net/ipv6/reassembly.c | 71 +--- net/ipv6/udp.c | 10 + net/irda/af_irda.c | 4 +- net/irda/irlan/irlan_common.c | 2 +- net/mac80211/main.c | 6 + net/netfilter/ipvs/ip_vs_core.c | 1 + net/netfilter/ipvs/ip_vs_ftp.c | 9 +- net/netfilter/ipvs/ip_vs_xmit.c | 18 +- net/netlink/af_netlink.c | 22 + net/sched/act_police.c | 21 +- net/sched/sch_hfsc.c | 2 +- net/sctp/sm_statefuns.c | 46 ++-- net/sunrpc/auth.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 9 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 10 +- net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 +- net/sunrpc/clnt.c | 116 +++--- net/sunrpc/rpc_pipe.c | 20 +- net/unix/af_unix.c | 15 +- net/wireless/core.c | 21 +- net/wireless/wext-compat.c | 3 + net/wireless/wext-core.c | 16 + net/xfrm/xfrm_user.c | 2 +- scripts/basic/docproc.c | 129 ++++++- scripts/kernel-doc | 54 +++- security/apparmor/include/resource.h | 4 +- security/apparmor/lib.c | 2 +- security/apparmor/lsm.c | 2 +- security/apparmor/path.c | 38 +-- security/apparmor/policy.c | 6 +- security/apparmor/resource.c | 20 +- security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_iint.c | 4 +- security/integrity/ima/ima_main.c | 8 +- security/keys/keyctl.c | 6 +- sound/core/rawmidi.c | 2 + sound/core/seq/oss/seq_oss_init.c | 9 +- sound/isa/msnd/msnd_pinnacle.c | 8 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/patch_cirrus.c | 50 +++ sound/pci/hda/patch_conexant.c | 58 +++ sound/pci/hda/patch_realtek.c | 1 + sound/pci/oxygen/oxygen.h | 1 + sound/pci/oxygen/oxygen_lib.c | 21 +- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_wm87x6.c | 22 +- sound/usb/card.c | 19 +- sound/usb/clock.c | 3 +- sound/usb/endpoint.c | 11 +- sound/usb/format.c | 22 +- sound/usb/mixer.c | 10 +- sound/usb/pcm.c | 3 +- tools/perf/util/callchain.h | 1 + tools/perf/util/probe-event.c | 1 + tools/perf/util/probe-finder.c | 42 ++- tools/perf/util/symbol.c | 7 + tools/perf/util/symbol.h | 3 +- virt/kvm/kvm_main.c | 5 +- 501 files changed, 5573 insertions(+), 3266 deletions(-) create mode 100644 Documentation/block/cfq-iosched.txt create mode 100644 arch/arm/mach-shmobile/pm_runtime.c delete mode 100644 drivers/md/.gitignore rename drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%) delete mode 100644 drivers/pci/pcie/pme/Makefile delete mode 100644 drivers/pci/pcie/pme/pcie_pme.h delete mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c create mode 100644 drivers/pci/pcie/portdrv_acpi.c create mode 100644 include/linux/intel-gtt.h create mode 100644 lib/raid6/.gitignore ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Merge made by recursive. CREDITS | 8 +- Documentation/hwmon/sysfs-interface | 7 +- Documentation/power/regulator/overview.txt | 2 +- Documentation/workqueue.txt | 380 ++++++++++++++++++++++ MAINTAINERS | 49 ++- Makefile | 2 +- arch/Kconfig | 4 +- arch/alpha/include/asm/cacheflush.h | 2 + arch/alpha/include/asm/unistd.h | 6 +- arch/alpha/kernel/entry.S | 81 ++--- arch/alpha/kernel/err_ev6.c | 12 +- arch/alpha/kernel/err_marvel.c | 33 +- arch/alpha/kernel/err_titan.c | 35 ++- arch/alpha/kernel/osf_sys.c | 9 +- arch/alpha/kernel/pci-sysfs.c | 2 +- arch/alpha/kernel/process.c | 2 +- arch/alpha/kernel/signal.c | 97 +----- arch/alpha/kernel/srm_env.c | 2 +- arch/alpha/kernel/systbls.S | 5 +- arch/alpha/kernel/time.c | 10 +- arch/alpha/kernel/traps.c | 3 - arch/arm/Kconfig | 27 ++- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/common/it8152.c | 8 + arch/arm/include/asm/pgtable.h | 4 + arch/arm/kernel/entry-common.S | 4 + arch/arm/mach-at91/at91sam9g45_devices.c | 4 +- arch/arm/mach-davinci/dm355.c | 3 +- arch/arm/mach-davinci/dm365.c | 3 +- arch/arm/mach-davinci/dm644x.c | 3 +- arch/arm/mach-davinci/dm646x.c | 3 +- arch/arm/mach-dove/include/mach/io.h | 6 +- arch/arm/mach-ixp4xx/common-pci.c | 8 + arch/arm/mach-ixp4xx/include/mach/hardware.h | 2 + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 2 +- arch/arm/mach-kirkwood/pcie.c | 4 +- arch/arm/mach-mmp/include/mach/system.h | 7 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 +- arch/arm/mach-pxa/include/mach/hardware.h | 14 +- arch/arm/mach-pxa/include/mach/io.h | 2 + arch/arm/mach-pxa/palm27x.c | 6 +- arch/arm/mach-pxa/vpac270.c | 1 + arch/arm/mach-s3c64xx/dev-spi.c | 3 +- arch/arm/mach-s3c64xx/mach-real6410.c | 104 +++--- arch/arm/mach-s5pv210/clock.c | 20 +- arch/arm/mach-s5pv210/cpu.c | 2 +- arch/arm/mach-u300/include/mach/gpio.h | 3 + arch/arm/mach-vexpress/ct-ca9x4.c | 8 +- arch/arm/mm/alignment.c | 19 +- arch/arm/mm/mmu.c | 31 ++- arch/arm/mm/proc-v7.S | 62 ++++- arch/arm/oprofile/common.c | 7 +- arch/arm/plat-nomadik/timer.c | 33 +-- arch/arm/plat-omap/Kconfig | 2 +- arch/arm/plat-omap/mcbsp.c | 2 +- arch/arm/plat-omap/sram.c | 25 +-- arch/arm/plat-s5p/dev-fimc0.c | 9 +- arch/arm/plat-s5p/dev-fimc1.c | 9 +- arch/arm/plat-s5p/dev-fimc2.c | 9 +- arch/arm/plat-samsung/gpio-config.c | 7 +- arch/arm/plat-samsung/include/plat/gpio-cfg.h | 10 +- arch/avr32/kernel/module.c | 3 +- arch/frv/kernel/signal.c | 51 ++-- arch/h8300/kernel/module.c | 3 +- arch/ia64/kernel/fsys.S | 42 +-- arch/m32r/include/asm/signal.h | 1 - arch/m32r/include/asm/unistd.h | 1 + arch/m32r/kernel/entry.S | 5 +- arch/m32r/kernel/ptrace.c | 7 +- arch/m32r/kernel/signal.c | 105 +++---- arch/m68k/mac/macboing.c | 6 +- arch/mips/Kconfig | 21 +- arch/mips/alchemy/common/prom.c | 5 +- arch/mips/boot/compressed/Makefile | 2 +- arch/mips/cavium-octeon/Kconfig | 4 + arch/mips/cavium-octeon/cpu.c | 2 +- arch/mips/cavium-octeon/executive/Makefile | 2 +- arch/mips/include/asm/atomic.h | 4 + arch/mips/include/asm/cop2.h | 2 +- arch/mips/include/asm/gic.h | 1 + arch/mips/include/asm/mach-tx49xx/kmalloc.h | 2 +- arch/mips/include/asm/mips-boards/maltaint.h | 3 - arch/mips/include/asm/page.h | 14 + arch/mips/include/asm/thread_info.h | 3 +- arch/mips/include/asm/unistd.h | 21 +- arch/mips/kernel/irq-gic.c | 5 +- arch/mips/kernel/kgdb.c | 2 +- arch/mips/kernel/kspd.c | 2 +- arch/mips/kernel/linux32.c | 7 + arch/mips/kernel/scall32-o32.S | 5 +- arch/mips/kernel/scall64-64.S | 7 +- arch/mips/kernel/scall64-n32.S | 5 +- arch/mips/kernel/scall64-o32.S | 5 +- arch/mips/mm/dma-default.c | 28 ++- arch/mips/mm/sc-rm7k.c | 2 +- arch/mips/mti-malta/malta-int.c | 3 + arch/mips/pci/pci-rc32434.c | 2 +- arch/mips/pnx8550/common/reset.c | 20 +- arch/mips/pnx8550/common/setup.c | 3 +- arch/mn10300/Kconfig | 1 - arch/mn10300/Kconfig.debug | 2 +- arch/mn10300/include/asm/bitops.h | 4 +- arch/mn10300/include/asm/signal.h | 2 +- arch/mn10300/kernel/module.c | 3 +- arch/mn10300/kernel/signal.c | 35 ++- arch/mn10300/mm/Makefile | 14 +- arch/mn10300/mm/cache-disabled.c | 21 ++ arch/mn10300/mm/cache.c | 20 +- arch/parisc/kernel/module.c | 3 +- arch/powerpc/kernel/module.c | 6 - arch/powerpc/kernel/signal.c | 2 + arch/powerpc/kernel/signal_32.c | 3 +- arch/powerpc/kernel/signal_64.c | 2 +- arch/powerpc/platforms/512x/clock.c | 2 +- arch/powerpc/platforms/52xx/efika.c | 9 +- arch/powerpc/platforms/52xx/mpc52xx_common.c | 8 +- arch/s390/kernel/module.c | 3 +- arch/sh/kernel/module.c | 2 - arch/sparc/kernel/perf_event.c | 14 +- arch/sparc/kernel/signal32.c | 161 ++++++---- arch/sparc/kernel/signal_32.c | 55 ++-- arch/sparc/kernel/signal_64.c | 45 ++- arch/tile/include/arch/chip_tile64.h | 3 + arch/tile/include/arch/chip_tilepro.h | 3 + arch/tile/include/asm/compat.h | 5 +- arch/tile/include/asm/io.h | 8 +- arch/tile/include/asm/processor.h | 12 + arch/tile/include/asm/ptrace.h | 15 +- arch/tile/include/asm/sigcontext.h | 18 +- arch/tile/include/asm/signal.h | 1 + arch/tile/include/asm/syscalls.h | 21 +- arch/tile/kernel/intvec_32.S | 7 - arch/tile/kernel/process.c | 30 ++- arch/tile/kernel/signal.c | 27 +- arch/tile/kernel/stack.c | 2 +- arch/um/drivers/net_kern.c | 17 +- arch/um/kernel/exec.c | 6 +- arch/um/kernel/internal.h | 2 +- arch/um/kernel/syscall.c | 4 +- arch/x86/Makefile | 2 +- arch/x86/boot/early_serial_console.c | 14 +- arch/x86/include/asm/amd_iommu_proto.h | 6 + arch/x86/include/asm/amd_iommu_types.h | 12 + arch/x86/include/asm/bitops.h | 2 +- arch/x86/include/asm/cpufeature.h | 5 +- arch/x86/include/asm/hpet.h | 1 - arch/x86/include/asm/hw_breakpoint.h | 2 +- arch/x86/kernel/Makefile | 2 + arch/x86/kernel/acpi/cstate.c | 2 +- arch/x86/kernel/amd_iommu.c | 4 +- arch/x86/kernel/amd_iommu_init.c | 67 +++-- arch/x86/kernel/apic/io_apic.c | 11 +- arch/x86/kernel/apic/x2apic_uv_x.c | 6 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 18 +- arch/x86/kernel/cpu/intel.c | 1 + arch/x86/kernel/cpu/perf_event.c | 12 +- arch/x86/kernel/cpu/perf_event_p4.c | 6 +- arch/x86/kernel/cpu/scattered.c | 1 + arch/x86/kernel/early-quirks.c | 18 - arch/x86/kernel/hpet.c | 33 +- arch/x86/kernel/hw_breakpoint.c | 40 +-- arch/x86/kernel/module.c | 3 +- arch/x86/lguest/boot.c | 13 +- arch/x86/oprofile/nmi_int.c | 5 +- arch/x86/xen/time.c | 5 +- block/blk-map.c | 2 +- block/blk-merge.c | 12 + block/cfq-iosched.c | 16 +- block/elevator.c | 12 +- drivers/Makefile | 2 +- drivers/acpi/Kconfig | 2 +- drivers/acpi/acpi_pad.c | 34 +- drivers/acpi/acpica/aclocal.h | 1 + drivers/acpi/acpica/exutils.c | 2 +- drivers/acpi/acpica/rsutils.c | 2 +- drivers/acpi/apei/Kconfig | 2 +- drivers/acpi/apei/apei-base.c | 21 +- drivers/acpi/apei/einj.c | 4 +- drivers/acpi/apei/erst-dbg.c | 18 +- drivers/acpi/apei/erst.c | 29 ++- drivers/acpi/apei/ghes.c | 2 +- drivers/acpi/apei/hest.c | 11 +- drivers/acpi/atomicio.c | 2 +- drivers/acpi/battery.c | 1 - drivers/acpi/blacklist.c | 18 + drivers/acpi/bus.c | 18 +- drivers/acpi/fan.c | 2 + drivers/acpi/processor_core.c | 6 - drivers/acpi/processor_driver.c | 2 +- drivers/acpi/processor_perflib.c | 4 +- drivers/acpi/sleep.c | 22 ++ drivers/acpi/sysfs.c | 20 +- drivers/acpi/video_detect.c | 4 +- drivers/ata/ahci.c | 4 + drivers/ata/ahci.h | 12 +- drivers/ata/ahci_platform.c | 6 +- drivers/ata/libahci.c | 16 +- drivers/block/cciss.c | 2 +- drivers/block/pktcdvd.c | 2 +- drivers/char/agp/intel-agp.c | 2 + drivers/char/agp/intel-agp.h | 2 + drivers/char/ipmi/ipmi_si_intf.c | 17 +- drivers/char/mem.c | 3 +- drivers/char/virtio_console.c | 6 +- drivers/cpuidle/governors/menu.c | 2 +- drivers/dca/dca-core.c | 85 +++++- drivers/dma/mv_xor.c | 2 +- drivers/dma/shdma.c | 3 +- drivers/edac/edac_mc.c | 3 + drivers/edac/i7core_edac.c | 1 + drivers/firewire/ohci.c | 1 + drivers/gpu/drm/drm_buffer.c | 6 +- drivers/gpu/drm/drm_crtc_helper.c | 10 +- drivers/gpu/drm/drm_gem.c | 39 +-- drivers/gpu/drm/drm_info.c | 2 +- drivers/gpu/drm/drm_pci.c | 4 + drivers/gpu/drm/drm_platform.c | 5 + drivers/gpu/drm/drm_sysfs.c | 2 +- drivers/gpu/drm/drm_vm.c | 28 +- drivers/gpu/drm/i810/i810_dma.c | 2 +- drivers/gpu/drm/i830/i830_dma.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 6 +- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_gem.c | 89 +++-- drivers/gpu/drm/i915/i915_gem_evict.c | 44 ++-- drivers/gpu/drm/i915/i915_suspend.c | 36 ++- drivers/gpu/drm/i915/intel_crt.c | 10 +- drivers/gpu/drm/i915/intel_display.c | 70 +++-- drivers/gpu/drm/i915/intel_dp.c | 21 +- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_dvo.c | 3 +- drivers/gpu/drm/i915/intel_fb.c | 4 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 7 +- drivers/gpu/drm/i915/intel_sdvo.c | 20 +- drivers/gpu/drm/i915/intel_tv.c | 11 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 12 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 + drivers/gpu/drm/nouveau/nouveau_gem.c | 6 +- drivers/gpu/drm/nouveau/nouveau_notifier.c | 1 + drivers/gpu/drm/radeon/atombios.h | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- drivers/gpu/drm/radeon/evergreen.c | 27 +- drivers/gpu/drm/radeon/r100.c | 24 +- drivers/gpu/drm/radeon/r600.c | 5 +- drivers/gpu/drm/radeon/r600_blit_kms.c | 25 ++ drivers/gpu/drm/radeon/r600_blit_shaders.h | 24 ++ drivers/gpu/drm/radeon/r600_cs.c | 5 +- drivers/gpu/drm/radeon/radeon_atombios.c | 9 + drivers/gpu/drm/radeon/radeon_combios.c | 47 +++ drivers/gpu/drm/radeon/radeon_connectors.c | 15 +- drivers/gpu/drm/radeon/radeon_display.c | 14 +- drivers/gpu/drm/radeon/radeon_fb.c | 14 +- drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/gpu/drm/radeon/radeon_kms.c | 4 + drivers/gpu/drm/radeon/radeon_mode.h | 3 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 145 +++++++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 8 + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 17 + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 34 ++- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 + drivers/gpu/vga/vgaarb.c | 2 +- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/adm1031.c | 43 ++- drivers/hwmon/coretemp.c | 57 ++-- drivers/hwmon/emc1403.c | 1 - drivers/hwmon/f71882fg.c | 32 +- drivers/hwmon/f75375s.c | 6 +- drivers/hwmon/lis3lv02d.c | 4 +- drivers/hwmon/lis3lv02d_i2c.c | 4 +- drivers/hwmon/lis3lv02d_spi.c | 4 +- drivers/hwmon/lm95241.c | 21 +- drivers/hwmon/pkgtemp.c | 23 +- drivers/hwmon/w83627ehf.c | 1 + drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-octeon.c | 2 +- drivers/i2c/busses/i2c-omap.c | 2 + drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/ide/ide-probe.c | 12 +- drivers/idle/intel_idle.c | 20 +- drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +- drivers/leds/leds-ns2.c | 9 +- drivers/md/md.c | 6 +- drivers/mfd/max8925-core.c | 13 +- drivers/mfd/wm831x-irq.c | 9 +- drivers/misc/Kconfig | 2 +- drivers/misc/Makefile | 2 +- drivers/misc/{vmware_balloon.c => vmw_balloon.c} | 0 drivers/mmc/host/sdhci-s3c.c | 12 +- drivers/mtd/nand/omap2.c | 2 +- drivers/net/3c59x.c | 17 +- drivers/net/atlx/atl1.c | 11 +- drivers/net/bonding/bond_3ad.c | 3 + drivers/net/bonding/bond_alb.c | 3 + drivers/net/cxgb3/cxgb3_main.c | 2 + drivers/net/e1000e/hw.h | 1 + drivers/net/e1000e/ich8lan.c | 197 ++++++++++-- drivers/net/e1000e/netdev.c | 29 +- drivers/net/eql.c | 2 + drivers/net/ibm_newemac/core.c | 4 +- drivers/net/netxen/netxen_nic_init.c | 3 - drivers/net/pcmcia/pcnet_cs.c | 139 +++++---- drivers/net/phy/mdio_bus.c | 4 +- drivers/net/ppp_generic.c | 9 +- drivers/net/qlcnic/qlcnic_init.c | 7 +- drivers/net/r8169.c | 5 +- drivers/net/rionet.c | 2 +- drivers/net/sgiseeq.c | 2 +- drivers/net/smsc911x.c | 1 + drivers/net/tulip/de2104x.c | 43 +++- drivers/net/usb/hso.c | 2 + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 5 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/pci/intel-iommu.c | 117 ++++--- drivers/pci/iov.c | 2 +- drivers/pci/pci.h | 5 +- drivers/pci/quirks.c | 20 ++ drivers/pcmcia/pcmcia_resource.c | 57 ++-- drivers/pcmcia/pd6729.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 5 +- drivers/power/apm_power.c | 1 + drivers/power/intel_mid_battery.c | 6 +- drivers/regulator/88pm8607.c | 4 +- drivers/regulator/ab3100.c | 5 +- drivers/regulator/ab8500.c | 9 +- drivers/regulator/ad5398.c | 12 +- drivers/regulator/core.c | 6 +- drivers/regulator/isl6271a-regulator.c | 2 +- drivers/regulator/max1586.c | 12 +- drivers/regulator/max8649.c | 2 +- drivers/regulator/max8998.c | 8 +- drivers/regulator/tps6507x-regulator.c | 6 - drivers/regulator/tps6586x-regulator.c | 4 +- drivers/regulator/wm831x-ldo.c | 7 +- drivers/regulator/wm8350-regulator.c | 2 +- drivers/rtc/rtc-ab3100.c | 2 + drivers/rtc/rtc-s3c.c | 13 +- drivers/s390/net/ctcm_main.c | 4 +- drivers/serial/amba-pl010.c | 9 +- drivers/serial/mfd.c | 18 +- drivers/serial/mrst_max3110.c | 1 + drivers/serial/serial_cs.c | 62 ++-- drivers/spi/spi.c | 5 + drivers/spi/spi_gpio.c | 2 +- drivers/spi/spi_mpc8xxx.c | 10 +- drivers/staging/batman-adv/hard-interface.c | 13 - drivers/staging/batman-adv/send.c | 8 +- drivers/staging/ti-st/st.h | 1 - drivers/staging/ti-st/st_core.c | 9 +- drivers/staging/ti-st/st_core.h | 2 +- drivers/staging/ti-st/st_kim.c | 22 +- drivers/staging/vt6655/wpactl.c | 11 +- drivers/usb/core/Kconfig | 6 +- drivers/usb/core/file.c | 35 +- drivers/usb/core/message.c | 1 + drivers/usb/host/ehci-pci.c | 5 + drivers/usb/musb/cppi_dma.c | 1 + drivers/usb/musb/musb_debugfs.c | 5 +- drivers/usb/musb/musb_gadget.c | 75 +++-- drivers/usb/musb/musb_gadget.h | 2 + drivers/usb/musb/musb_gadget_ep0.c | 9 + drivers/usb/musb/musb_host.c | 6 + drivers/usb/otg/twl4030-usb.c | 78 +++-- drivers/usb/serial/mos7720.c | 3 + drivers/usb/serial/mos7840.c | 3 + drivers/vhost/net.c | 2 +- drivers/vhost/vhost.c | 7 +- drivers/video/console/fbcon.c | 5 +- drivers/video/efifb.c | 103 +++++- drivers/video/pxa168fb.c | 4 +- drivers/video/sis/sis_main.c | 3 + drivers/video/via/ioctl.c | 2 + drivers/watchdog/Kconfig | 6 +- drivers/watchdog/sb_wdog.c | 12 +- drivers/watchdog/ts72xx_wdt.c | 3 + drivers/xen/xenbus/xenbus_probe.c | 9 +- fs/aio.c | 10 +- fs/ceph/Kconfig | 1 + fs/ceph/addr.c | 7 +- fs/ceph/caps.c | 27 +- fs/ceph/dir.c | 10 +- fs/ceph/inode.c | 11 +- fs/ceph/mds_client.c | 2 + fs/ceph/pagelist.c | 12 +- fs/ceph/snap.c | 92 ++---- fs/ceph/super.h | 5 +- fs/char_dev.c | 4 +- fs/cifs/cifssmb.c | 49 ++- fs/cifs/connect.c | 6 +- fs/cifs/inode.c | 2 + fs/coda/psdev.c | 4 +- fs/compat.c | 2 +- fs/fs-writeback.c | 12 +- fs/fuse/dev.c | 2 +- fs/gfs2/log.c | 2 +- fs/ocfs2/acl.c | 3 + fs/ocfs2/cluster/tcp.c | 2 +- fs/ocfs2/dir.c | 24 +- fs/ocfs2/dlm/dlmcommon.h | 1 + fs/ocfs2/dlm/dlmdebug.c | 9 +- fs/ocfs2/dlm/dlmdomain.c | 1 + fs/ocfs2/dlm/dlmmaster.c | 40 +++ fs/ocfs2/dlmglue.h | 1 + fs/ocfs2/ocfs2_fs.h | 37 ++- fs/ocfs2/ocfs2_ioctl.h | 8 +- fs/ocfs2/refcounttree.c | 5 +- fs/ocfs2/reservations.c | 22 +- fs/ocfs2/suballoc.c | 4 +- fs/ocfs2/symlink.c | 2 +- fs/ocfs2/xattr.c | 4 +- fs/proc/base.c | 4 +- fs/proc/task_mmu.c | 4 +- fs/proc/vmcore.c | 2 +- fs/reiserfs/ioctl.c | 7 +- fs/xfs/xfs_log_cil.c | 12 +- fs/xfs/xfs_log_priv.h | 37 ++- include/acpi/acpixf.h | 2 +- include/drm/drmP.h | 29 ++- include/drm/drm_crtc.h | 10 +- include/drm/drm_pciids.h | 2 +- include/linux/cpuidle.h | 1 + include/linux/dma-mapping.h | 4 + include/linux/dmaengine.h | 2 +- include/linux/elevator.h | 1 + include/linux/fs.h | 4 + include/linux/module.h | 5 +- include/linux/netlink.h | 4 +- include/linux/netpoll.h | 8 +- include/linux/pci_ids.h | 3 + include/linux/rcupdate.h | 2 +- include/linux/socket.h | 2 +- include/linux/wait.h | 1 + include/linux/workqueue.h | 4 + include/net/addrconf.h | 1 + include/net/dst.h | 1 + include/net/route.h | 2 + include/net/tcp.h | 18 +- include/net/xfrm.h | 4 +- ipc/sem.c | 2 + kernel/fork.c | 2 +- kernel/hw_breakpoint.c | 3 +- kernel/kfifo.c | 2 - kernel/module.c | 4 + kernel/sched.c | 8 +- kernel/sched_fair.c | 2 +- kernel/smp.c | 17 +- kernel/workqueue.c | 27 +- lib/bug.c | 6 +- lib/list_sort.c | 2 +- mm/backing-dev.c | 2 + mm/fremap.c | 7 +- mm/hugetlb.c | 24 +- mm/ksm.c | 6 +- mm/memory.c | 8 +- mm/mmap.c | 1 + mm/oom_kill.c | 49 ++-- mm/percpu.c | 2 +- mm/rmap.c | 23 +- mm/vmscan.c | 43 ++- net/8021q/vlan_core.c | 14 +- net/9p/trans_rdma.c | 29 +- net/9p/trans_virtio.c | 3 +- net/Kconfig | 2 +- net/atm/br2684.c | 12 +- net/core/dev.c | 2 +- net/core/iovec.c | 5 +- net/core/sock.c | 8 +- net/ipv4/Kconfig | 1 + net/ipv4/igmp.c | 2 +- net/ipv4/ip_gre.c | 8 +- net/ipv4/ip_output.c | 19 +- net/ipv4/ip_sockglue.c | 3 + net/ipv4/netfilter/ipt_REJECT.c | 1 + net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- net/ipv4/netfilter/nf_nat_snmp_basic.c | 6 +- net/ipv4/route.c | 2 +- net/ipv4/tcp.c | 9 +- net/ipv4/tcp_input.c | 5 +- net/ipv4/tcp_timer.c | 24 +- net/ipv4/xfrm4_policy.c | 2 +- net/ipv4/xfrm4_state.c | 33 +- net/ipv6/addrconf.c | 11 +- net/ipv6/addrlabel.c | 5 + net/ipv6/ip6_output.c | 18 +- net/ipv6/route.c | 2 +- net/ipv6/xfrm6_state.c | 33 +- net/llc/af_llc.c | 3 +- net/llc/llc_station.c | 2 +- net/mac80211/rx.c | 4 - net/netfilter/nf_conntrack_extend.c | 4 +- net/netfilter/nf_conntrack_sip.c | 2 +- net/netfilter/nf_tproxy_core.c | 6 +- net/phonet/pep.c | 3 +- net/rds/tcp_connect.c | 4 +- net/rds/tcp_listen.c | 4 +- net/rds/tcp_recv.c | 4 +- net/rds/tcp_send.c | 4 +- net/rose/af_rose.c | 4 +- net/sched/sch_atm.c | 4 - net/sctp/output.c | 1 - net/sunrpc/xprtsock.c | 28 +- net/wireless/wext-priv.c | 2 +- net/xfrm/xfrm_output.c | 2 +- net/xfrm/xfrm_policy.c | 5 +- net/xfrm/xfrm_state.c | 45 ++- samples/kfifo/dma-example.c | 17 +- security/tomoyo/common.c | 6 +- security/tomoyo/common.h | 3 - sound/core/control.c | 5 + sound/core/pcm.c | 33 ++- sound/core/pcm_native.c | 2 + sound/i2c/other/ak4xxx-adda.c | 2 +- sound/pci/hda/hda_intel.c | 3 + sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_nvhdmi.c | 2 +- sound/pci/hda/patch_realtek.c | 32 ++- sound/pci/oxygen/oxygen.c | 4 + sound/pci/rme9652/hdsp.c | 1 + sound/pci/rme9652/hdspm.c | 1 + sound/ppc/snd_ps3.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 3 +- sound/soc/sh/migor.c | 15 +- sound/soc/soc-cache.c | 5 +- tools/perf/Makefile | 2 +- tools/perf/util/trace-event-scripting.c | 4 +- tools/perf/util/ui/browsers/hists.c | 2 +- virt/kvm/eventfd.c | 3 +- virt/kvm/kvm_main.c | 4 +- 536 files changed, 4533 insertions(+), 2393 deletions(-) create mode 100644 Documentation/workqueue.txt create mode 100644 arch/mn10300/mm/cache-disabled.c mode change 100755 => 100644 drivers/idle/intel_idle.c rename drivers/misc/{vmware_balloon.c => vmw_balloon.c} (100%) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Removing Documentation/block/barrier.txt Removing block/blk-barrier.c Auto-merging block/blk-map.c Auto-merging block/blk-merge.c Auto-merging block/cfq-iosched.c Auto-merging block/elevator.c Auto-merging drivers/block/cciss.c Auto-merging drivers/block/pktcdvd.c Auto-merging drivers/md/md.c Auto-merging drivers/s390/scsi/zfcp_scsi.c Auto-merging drivers/scsi/sd.c Auto-merging fs/gfs2/log.c Auto-merging include/linux/fs.h Merge made by recursive. Documentation/block/00-INDEX | 4 +- Documentation/block/barrier.txt | 261 ------ Documentation/block/writeback_cache_control.txt | 86 ++ Documentation/cgroups/blkio-controller.txt | 106 +++- Documentation/lguest/lguest.c | 29 +- block/Kconfig | 12 + block/Makefile | 3 +- block/blk-barrier.c | 350 ------- block/blk-cgroup.c | 804 +++++++++++++---- block/blk-cgroup.h | 87 ++- block/blk-core.c | 101 ++- block/blk-exec.c | 9 +- block/blk-flush.c | 262 ++++++ block/blk-integrity.c | 93 ++- block/blk-lib.c | 39 +- block/blk-map.c | 5 +- block/blk-merge.c | 23 +- block/blk-settings.c | 30 +- block/blk-sysfs.c | 11 + block/blk-throttle.c | 1123 +++++++++++++++++++++++ block/blk.h | 16 +- block/cfq-iosched.c | 23 +- block/cfq.h | 2 +- block/elevator.c | 79 +-- block/genhd.c | 16 +- block/ioctl.c | 6 +- drivers/block/amiflop.c | 60 +- drivers/block/ataflop.c | 50 +- drivers/block/brd.c | 1 - drivers/block/cciss.c | 860 +++++++++--------- drivers/block/drbd/drbd_int.h | 3 +- drivers/block/drbd/drbd_receiver.c | 3 +- drivers/block/floppy.c | 66 +- drivers/block/loop.c | 121 +++- drivers/block/osdblk.c | 5 +- drivers/block/pktcdvd.c | 1 - drivers/block/ps3disk.c | 2 +- drivers/block/virtio_blk.c | 37 +- drivers/block/xen-blkfront.c | 47 +- drivers/ide/ide-disk.c | 13 +- drivers/ide/ide-io.c | 13 - drivers/md/dm-crypt.c | 2 +- drivers/md/dm-io.c | 20 +- drivers/md/dm-log.c | 2 +- drivers/md/dm-raid1.c | 8 +- drivers/md/dm-region-hash.c | 16 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-snap.c | 8 +- drivers/md/dm-stripe.c | 2 +- drivers/md/dm-table.c | 5 - drivers/md/dm.c | 398 ++------- drivers/md/linear.c | 4 +- drivers/md/md.c | 117 +-- drivers/md/md.h | 23 +- drivers/md/multipath.c | 4 +- drivers/md/raid0.c | 4 +- drivers/md/raid1.c | 176 ++--- drivers/md/raid1.h | 2 - drivers/md/raid10.c | 7 +- drivers/md/raid5.c | 43 +- drivers/md/raid5.h | 1 + drivers/mmc/card/queue.c | 1 - drivers/s390/block/dasd.c | 1 - drivers/s390/scsi/zfcp_scsi.c | 1 + drivers/scsi/aic7xxx_old.c | 22 +- drivers/scsi/hosts.c | 1 + drivers/scsi/libsas/sas_scsi_host.c | 13 +- drivers/scsi/scsi_lib.c | 26 +- drivers/scsi/scsi_sysfs.c | 2 + drivers/scsi/sd.c | 18 +- drivers/scsi/sg.c | 2 +- fs/block_dev.c | 2 +- fs/btrfs/disk-io.c | 19 +- fs/btrfs/extent-tree.c | 3 +- fs/btrfs/volumes.c | 4 - fs/btrfs/volumes.h | 1 - fs/buffer.c | 7 +- fs/ext3/fsync.c | 3 +- fs/ext4/fsync.c | 5 +- fs/ext4/mballoc.c | 2 +- fs/fat/fatent.c | 3 +- fs/fat/misc.c | 5 +- fs/gfs2/log.c | 19 +- fs/gfs2/rgrp.c | 6 +- fs/jbd/commit.c | 32 +- fs/jbd2/checkpoint.c | 3 +- fs/jbd2/commit.c | 76 +-- fs/nilfs2/super.c | 10 +- fs/nilfs2/the_nilfs.c | 7 +- fs/ocfs2/file.c | 2 +- fs/partitions/check.c | 23 +- fs/partitions/check.h | 3 + fs/partitions/efi.c | 25 + fs/reiserfs/file.c | 3 +- fs/reiserfs/journal.c | 106 +-- fs/xfs/linux-2.6/xfs_buf.c | 16 +- fs/xfs/linux-2.6/xfs_buf.h | 11 +- fs/xfs/linux-2.6/xfs_super.c | 3 +- fs/xfs/linux-2.6/xfs_trace.h | 1 - fs/xfs/xfs_log.c | 13 - include/linux/bio.h | 4 + include/linux/blk_types.h | 8 +- include/linux/blkdev.h | 160 ++-- include/linux/buffer_head.h | 2 - include/linux/fs.h | 28 +- include/linux/genhd.h | 53 +- include/linux/kernel.h | 10 + include/linux/sched.h | 3 + include/scsi/scsi.h | 6 + include/scsi/scsi_host.h | 7 + include/scsi/scsi_tcq.h | 6 +- init/Kconfig | 9 +- init/do_mounts.c | 70 ++ mm/swapfile.c | 6 +- 114 files changed, 3905 insertions(+), 2673 deletions(-) delete mode 100644 Documentation/block/barrier.txt create mode 100644 Documentation/block/writeback_cache_control.txt delete mode 100644 block/blk-barrier.c create mode 100644 block/blk-flush.c create mode 100644 block/blk-throttle.c ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merging drivers/ata/ahci.c Auto-merging drivers/ata/ahci.h Auto-merging drivers/ata/ahci_platform.c Auto-merging drivers/ata/libahci.c Merge made by recursive. Documentation/ABI/testing/sysfs-ata | 99 +++++ drivers/ata/Makefile | 2 +- drivers/ata/ahci.c | 3 - drivers/ata/ahci.h | 3 +- drivers/ata/ahci_platform.c | 3 - drivers/ata/ata_piix.c | 32 +- drivers/ata/libahci.c | 176 +++------ drivers/ata/libata-core.c | 389 ++++++++---------- drivers/ata/libata-eh.c | 254 ++++++++++-- drivers/ata/libata-pmp.c | 66 +++- drivers/ata/libata-scsi.c | 204 +++++----- drivers/ata/libata-sff.c | 14 +- drivers/ata/libata-transport.c | 774 +++++++++++++++++++++++++++++++++++ drivers/ata/libata-transport.h | 18 + drivers/ata/libata.h | 21 +- drivers/ata/pata_bf54x.c | 4 +- drivers/ata/pata_samsung_cf.c | 2 +- drivers/ata/pata_scc.c | 4 +- drivers/ata/sata_fsl.c | 27 +- drivers/ata/sata_inic162x.c | 2 +- drivers/ata/sata_mv.c | 25 +- drivers/ata/sata_nv.c | 57 +-- drivers/ata/sata_sil24.c | 14 +- drivers/ata/sata_via.c | 2 +- include/linux/ata.h | 46 ++- include/linux/libata.h | 63 ++- 26 files changed, 1682 insertions(+), 622 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-ata create mode 100644 drivers/ata/libata-transport.c create mode 100644 drivers/ata/libata-transport.h ## # 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-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 mm next 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 1087983 bytes received 1155 bytes 726092.00 bytes/sec total size is 1082222 speedup is 0.99 Using base v2.6.36-rc1 ## # 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.36-rc3-stor31. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.36-rc3-stor31 4f73d17] 2.6.36-rc3-stor31 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- ##