Switched to branch "2.6.25-rc7-mc3" fatal: Not a valid object name: '2.6.25-rc7'. Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc7-mc3" Switched to branch "gregkh-driver" Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Switched to branch "2.6.25-rc7-mc3" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-pci" .dotest/patch:167: space before tab in indent. dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name); warning: 1 line adds whitespace errors. Switched to branch "2.6.25-rc7-mc3" Already on branch "2.6.25-rc7-mc3" Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8366: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8741: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8805: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc7-mc3" Already on branch "2.6.25-rc7-mc3" error: branch 'agp' not found. remote: Counting objects: 2216, done. remote: Compressing objects: 0% (1/465) remote: Compressing objects: 1% (5/465) remote: Compressing objects: 2% (10/465) remote: Compressing obj eremote: cts: 3% (14/465) remote: Compressing objects: 4% (19/465) remote: Compressing objects: 5% (24/465) remote: Compressing objects: 6% (28/465) remote: Compressing objects: 7% (33/465) remote: Compressing objects: 8% (38/465) remote: Compressing objects: 9% (42/465) remote: Compressing objects: 10% (47/465) remote: Compressing objects: 11% (52/465) remote: Compressing objects: 12% (56/465) remote: Compressing objects: 13% (61/465) remote: Compressing objects: 14% (66/465) remote: Compressing objects: 15% (70/465) remote: Compressing objects: 16% (75/465) remote: Compressing objects: 17% (80/465) remote: Compressing objects: 18% (84/465) remote: Compressing objects: 19% (89/465) remote: Compressing objects: 20% (93/465) remote: Compressing objects: 21% (98/465) remote: Compressing objects: 22% (103/465) remote: Compressing objects: 23% (107/465) remote: Compressing objects: 24% (112/465) remote: Compressing objects: 25% (117/465) remote: Compressing objects: 26% (121/465) remote: Compressing objects: 27% (126/465) remote: Compressing objects: 28% (131/465) remote: Compressing objects: 29% (135/465) remote: Compressing objects: 30% (140/465) remote: Compressing objects: 31% (145/465) remote: Compressing objects: 32% (149/465) remote: Compressing objects: 33% (154/465) remote: Compressing objects: 34% (159/465) remote: Compressing objects: 35% (163/465) remote: Compressing objects: 36% (168/465) remote: Compressing objects: 37% (173/465) remote: Compressing objects: 38% (177/465) remote: Compressing objects: 39% (182/465) remote: Compressing objects: 40% (186/465) remote: Compressing objects: 41% (191/465) remote: Compressing objects: 42% (196/465) remote: Compressing objects: 43% (200/465) remote: Compressing objects: 44% (205/465) remote: Compressing objects: 45% (210/465) remote: Compressing objects: 46% (214/465) remote: Compressing objects: 47% (219/465) remote: Compressing objects: 48% (224/465) remote: Compressing objects: 49% (228/465) remote: Compressing objects: 50% (233/465) remote: Compressing objects: 51% (238/465) remote: Compressing objects: 52% (242/465) remote: Compressing objects: 53% (247/465) remote: Compressing objects: 54% (252/465) remote: Compressing objects: 55% (256/465) remote: Compressing objects: 56% (261/465) remote: Compressing objects: 57% (266/465) remote: Compressing objects: 58% (270/465) remote: Compressing objects: 59% (275/465) remote: Compressing objects: 60% (279/465) remote: Compressing objects: 61% (284/465) remote: Compressing objects: 62% (289/465) remote: Compressing objects: 63% (293/465) remote: Compressing objects: 64% (298/465) remote: Compressing objects: 65% (303/465) remote: Compressing objects: 66% (307/465) remote: Compressing objects: 67% (312/465) remote: Compressing objects: 68% (317/465) remote: Compressing objects: 69% (321/465) remote: Compressing objects: 70% (326/465) remote: Compressing objects: 71% (331/465) remote: Compressing objects: 72% (335/465) remote: Compressing objects: 73% (340/465) remote: Compressing objects: 74% (345/465) remote: Compressing objects: 75% (349/465) remote: Compressing objects: 76% (354/465) remote: Compressing objects: 77% (359/465) remote: Compressing objects: 78% (363/465) remote: Compressing objects: 79% (368/465) remote: Compressing objects: 80% (372/465) remote: Compressing objects: 81% (377/465) remote: Compressing objects: 82% (382/465) remote: Compressing objects: 83% (386/465) remote: Compressing objects: 84% (391/465) remote: Compressing objects: 85% (396/465) remote: Compressing objects: 86% (400/465) remote: Compressing objects: 87% (405/465) remote: Compressing objects: 88% (410/465) remote: Compressing objects: 89% (414/465) remote: Compressing objects: 90% (419/465) remote: Compressing objects: 91% (424/465) remote: Compressing objects: 92% (428/465) remote: Compressing objects: 93% (433/465) remote: Compressing objects: 94% (438/465) remote: Compressing objects: 95% (442/465) remote: Compressing objects: 96% (447/465) remote: Compressing objects: 97% (452/465) remote: Compressing objects: 98% (456/465) remote: Compressing objects: 99% (461/465) remote: Compressing objects: 100% (465/465) remote: Compressing objects: 100% (465/465), done. Receiving objects: 0% (1/1941) Receiving objects: 1% (20/1941) Receiving objects: 2% (39/1941) Receiving objects: 3% (59/1941) Receiving objects: 4% (78/1941) Receiving objects: 5% (98/1941) Receiving objects: 6% (117/1941) Receiving objects: 7% (136/1941) Receiving objects: 8% (156/1941) Receiving objects: 9% (175/1941) Receiving objects: 10% (195/1941) Receiving objects: 11% (214/1941) Receiving objects: 12% (233/1941) Receiving objects: 13% (253/1941) Receiving objects: 14% (272/1941) Receiving objects: 15% (292/1941) Receiving objects: 16% (311/1941) Receiving objects: 17% (330/1941) Receiving objects: 18% (350/1941) Receiving objects: 19% (369/1941) Receiving objects: 20% (389/1941) Receiving objects: 21% (408/1941) Receiving objects: 22% (428/1941) Receiving objects: 23% (447/1941) Receiving objects: 24% (466/1941) Receiving objects: 25% (486/1941) Receiving objects: 26% (505/1941) Receiving objects: 27% (525/1941) Receiving objects: 28% (544/1941) Receiving objects: 29% (563/1941) Receiving objects: 30% (583/1941) Receiving objects: 31% (602/1941) Receiving objects: 32% (622/1941) Receiving objects: 33% (641/1941) Receiving objects: 34% (660/1941) Receiving objects: 35% (680/1941) Receiving objects: 36% (699/1941) Receiving objects: 37% (719/1941) Receiving objects: 38% (738/1941) Receiving objects: 39% (757/1941) Receiving objects: 40% (777/1941) Receiving objects: 41% (796/1941) Receiving objects: 42% (816/1941) Receiving objects: 43% (835/1941) Receiving objects: 44% (855/1941) Receiving objects: 45% (874/1941) Receiving objects: 46% (893/1941) Receiving objects: 47% (913/1941) Receiving objects: 48% (932/1941) Receiving objects: 49% (952/1941) Receiving objects: 50% (971/1941) Receiving objects: 51% (990/1941) Receiving objects: 52% (1010/1941) Receiving objects: 53% (1029/1941) Receiving objects: 54% (1049/1941) Receiving objects: 55% (1068/1941) Receiving objects: 56% (1087/1941) Receiving objects: 57% (1107/1941) Receiving objects: 58% (1126/1941) Receiving objects: 59% (1146/1941) Receiving objects: 60% (1165/1941) Receiving objects: 61% (1185/1941) Receiving objects: 62% (1204/1941) Receiving objects: 63% (1223/1941) Receiving objects: 64% (1243/1941) Receiving objects: 65% (1262/1941) Receiving objects: 66% (1282/1941) Receiving objects: 67% (1301/1941) Receiving objects: 68% (1320/1941) Receiving objects: 69% (1340/1941) Receiving objects: 70% (1359/1941) Receiving objects: 71% (1379/1941) Receiving objects: 72% (1398/1941) Receiving objects: 73% (1417/1941) Receiving objects: 74% (1437/1941) Receiving objects: 75% (1456/1941) Receiving objects: 76% (1476/1941) Receiving objects: 77% (1495/1941) Receiving objects: 78% (1514/1941) Receiving objects: 79% (1534/1941) Receiving objects: 80% (1553/1941) Receiving objects: 81% (1573/1941) Receiving objects: 82% (1592/1941) Receiving objects: 83% (1612/1941) Receiving objects: 84% (1631/1941) Receiving objects: 85% (1650/1941) Receiving objects: 86% (1670/1941) Receiving objects: 87% (1689/1941) Receiving objects: 88% (1709/1941) Receiving objects: 89% (1728/1941) Receiving objects: 90% (1747/1941) Receiving objects: 91% (1767/1941) Receiving objects: 92% (1786/1941) Receiving objects: 93% (1806/1941) Receiving objects: 94% (1825/1941) Receiving objects: 95% (1844/1941) Receiving objects: 96% (1864/1941) Receiving objects: 97% (1883/1941) Receiving objects: 98% (1903/1941) Receiving objects: 99% (1922/1941) Receiving objects: 100% (1941/1941) Receiving objects: 100% (1941/1941), 320.49 KiB, done. Resolving deltas: 0% (4/1726) Resolving deltas: 1% (20/1726) Resolving deltas: 11% (195/1726) Resolving deltas: 14% (243/1726) Resolving deltas: 16% (278/1726) Resolving deltas: 18% (315/1726) Resolving deltas: 20% (360/1726) remote: Total 1941 (delta 1726), reused 1691 (delta 1476) Resolving deltas: 33% (578/1726) Resolving deltas: 34% (591/1726) Resolving deltas: 35% (606/1726) Resolving deltas: 36% (622/1726) Resolving deltas: 48% (836/1726) Resolving deltas: 49% (846/1726) Resolving deltas: 50% (863/1726) Resolving deltas: 51% (883/1726) Resolving deltas: 53% (918/1726) Resolving deltas: 54% (933/1726) Resolving deltas: 55% (950/1726) Resolving deltas: 56% (970/1726) Resolving deltas: 57% (985/1726) Resolving deltas: 58% (1002/1726) Resolving deltas: 59% (1020/1726) Resolving deltas: 69% (1198/1726) Resolving deltas: 70% (1209/1726) Resolving deltas: 71% (1226/1726) Resolving deltas: 72% (1243/1726) Resolving deltas: 73% (1260/1726) Resolving deltas: 74% (1285/1726) Resolving deltas: 75% (1295/1726) Resolving deltas: 76% (1318/1726) Resolving deltas: 77% (1332/1726) Resolving deltas: 78% (1352/1726) Resolving deltas: 79% (1368/1726) Resolving deltas: 80% (1381/1726) Resolving deltas: 82% (1425/1726) Resolving deltas: 83% (1439/1726) Resolving deltas: 84% (1452/1726) Resolving deltas: 85% (1468/1726) Resolving deltas: 86% (1485/1726) Resolving deltas: 87% (1508/1726) Resolving deltas: 88% (1530/1726) Resolving deltas: 89% (1538/1726) Resolving deltas: 90% (1555/1726) Resolving deltas: 91% (1571/1726) Resolving deltas: 92% (1596/1726) Resolving deltas: 93% (1609/1726) Resolving deltas: 94% (1623/1726) Resolving deltas: 95% (1640/1726) Resolving deltas: 96% (1657/1726) Resolving deltas: 97% (1682/1726) Resolving deltas: 98% (1693/1726) Resolving deltas: 99% (1711/1726) Resolving deltas: 100% (1726/1726) Resolving deltas: 100% (1726/1726), completed with 251 local objects. From /pub/scm/linux/kernel/git/mchehab/v4l-dvb + 50ae607...f7c1d0a devel -> dvb (forced update) fatal: Not a valid object name: '2.6.25-rc7'. Switched to branch "i2c" Switched to branch "2.6.25-rc7-mc3" Already on branch "2.6.25-rc7-mc3" From /pub/scm/linux/kernel/git/roland/infiniband + 9a14368...85b7b7b for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc7-mc3" Already on branch "2.6.25-rc7-mc3" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 39, done. remote: Compressing objects: 33% (1/3) remote: Compressing objects: 66% (2/3) remote: Compressing objects: 100% (3/ 3remote: ) remote: Compressing objects: 100% (3/3), done. remote: Total 13 (delta 11), reused 12 (delta 10) From /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 + a77b352...1192aeb release -> acpi (forced update) Already on branch "2.6.25-rc7-mc3" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 1 remote: Counting objects: 64, done. remote: Compressing objects: 2% (1/45) remote: Compressing objects: 4% (2/45) remote: Compressing objects: 6% (3/45) remote: Compressing objects: 8% (4/45) remote: Compressing objects: 11% (5/45) remote: Compressing objects: 13% (6/45) remote: Compressing objects: 15% (7/45) remote: Compressing objects: 17% (8/45) remote: Compressing objects: 20% (9/45) remote: Compressing objects: 22% (10/45) remote: Compressing objects: 24% (11/45) remote: Compressing objects: 26% (12/45) remote: Compressing objects: 28% (13/45) remote: Compressing objects: 31% (14/45) remote: Compressing objects: 33% (15/45) remote: Compressing objects: 35% (16/45) remote: Compressing objects: 37% (17/45) remote: Compressing objects: 40% (18/45) remote: Compressing objects: 42% (19/45) remote: Compressing objects: 44% (20/45) remote: Compressing objects: 46% (21/45) remote: Compressing objects: 48% (22/45) remote: Compressing objects: 51% (23/45) remote: Compressing objects: 53% (24/45) remote: Compressing objects: 55% (25/45) remote: Compressing objects: 57% (26/45) remote: Compressing objects: 60% (27/45) remote: Compressing objects: 62% (28/45) remote: Compressing objects: 64% (29/45) remote: Compressing objects: 66% (30/45) remote: Compressing objects: 68% (31/45) remote: Compressing objects: 71% (32/45) remote: Compressing objects: 73% (33/45) remote: Compressing objects: 75% (34/45) remote: Compressing objects: 77% (35/45) remote: Compressing objects: 80% (36/45) remote: Compressing objects: 82% (37/45) remote: Compressing objects: 84% (38/45) remote: Compressing objects: 86% (39/45) remote: Compressing objects: 88% (40/45) remote: Compressing objects: 91% (41/45) remote: Compressing objects: 93% (42/45) remote: Compressing objects: 95% (43/45) remote: Compressing objects: 97% (44/45) remote: Compressing objects: 100% (45/45) remote: Compressing objects: 100% (45/45), done. remote: Total 45 (delta 38), reused 0 (delta 0) From git://oss.sgi.com:8090/xfs/xfs-2.6 ec1a5d6..329e0dc master -> xfs Switched to branch "doc" Switched to branch "2.6.25-rc7-mc3" Already on branch "2.6.25-rc7-mc3" Already on branch "2.6.25-rc7-mc3" 4 +- drivers/scsi/megaraid/megaraid_mbox.c | 13 +- drivers/scsi/ncr53c8xx.c | 7 +- drivers/scsi/osst.c | 76 ++-- drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- drivers/scsi/qla2xxx/qla_attr.c | 177 +++--- drivers/scsi/qla2xxx/qla_gbl.h | 4 +- drivers/scsi/raid_class.c | 73 ++-- drivers/scsi/scsi_sas_internal.h | 24 +- drivers/scsi/scsi_sysfs.c | 150 +++-- drivers/scsi/scsi_transport_fc.c | 385 +++++++------ drivers/scsi/scsi_transport_iscsi.c | 107 ++-- drivers/scsi/scsi_transport_sas.c | 157 +++--- drivers/scsi/scsi_transport_spi.c | 185 +++--- drivers/scsi/scsi_transport_srp.c | 26 +- drivers/scsi/sd.c | 78 ++- drivers/scsi/ses.c | 28 +- drivers/scsi/sg.c | 36 +- drivers/scsi/st.c | 71 ++- drivers/serial/serial_core.c | 2 +- drivers/uio/Kconfig | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio.c | 2 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 22 +- fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 118 +---- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 +++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 14 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 61 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 117 files changed, 2749 insertions(+), 2890 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # merge gregkh-driver resolve /home/jejb/gregkh-driver-fixup.diff ## Auto-merged MAINTAINERS Auto-merged drivers/base/transport_class.c Auto-merged drivers/message/fusion/mptscsih.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/3w-xxxx.c Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/raid_class.c Auto-merged drivers/scsi/scsi_sysfs.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c Auto-merged drivers/scsi/st.c Auto-merged include/linux/attribute_container.h Auto-merged include/linux/transport_class.h Auto-merged include/scsi/scsi_host.h Created commit f5145c9: Resolve Patch: /home/jejb/gregkh-driver-fixup.diff ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/. gregkh-pci base gregkh-driver ## building file list ... done ./ README ide-remove-ide-reverse-ide-core.patch pci-add-generic-pci_enable_resources.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-add-pci-express-aspm-support.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-clean-up-search.c-a-lot.patch pci-cris-use-generic-pci_enable_resources.patch pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-expose-pci-vpd-through-sysfs.patch pci-frv-use-generic-pci_enable_resources.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-ia64-use-generic-pci_enable_resources.patch pci-if-0-pci_assign_resource_fixed.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-iommu-iotlb-flushing.patch pci-iova-rb-tree-setup-tweak.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch pci-replace-remaining-__function__-occurrences.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch series sent 438399 bytes received 972 bytes 878742.00 bytes/sec total size is 433380 speedup is 0.99 Using base gregkh-driver pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-add-pci-express-aspm-support.patch pci-add-generic-pci_enable_resources.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-iova-rb-tree-setup-tweak.patch pci-simplify-quirk-debug-output.patch pci-iommu-iotlb-flushing.patch pci-expose-pci-vpd-through-sysfs.patch pci-replace-remaining-__function__-occurrences.patch ## # merge gregkh-pci ## Merge made by recursive. Documentation/00-INDEX | 10 - Documentation/ABI/testing/sysfs-bus-pci | 11 + Documentation/PCI/00-INDEX | 12 + Documentation/{ => PCI}/PCIEBUS-HOWTO.txt | 12 +- Documentation/{ => PCI}/pci-error-recovery.txt | 0 Documentation/{ => PCI}/pci.txt | 2 +- Documentation/{ => PCI}/pcieaer-howto.txt | 2 +- Documentation/ide/ide.txt | 2 - Documentation/kernel-parameters.txt | 10 +- Documentation/memory-barriers.txt | 4 +- arch/alpha/kernel/pci.c | 23 +- arch/arm/kernel/bios32.c | 27 +- arch/cris/arch-v32/drivers/pci/bios.c | 34 +- arch/frv/mb93090-mb00/pci-frv.c | 32 - arch/frv/mb93090-mb00/pci-frv.h | 3 - arch/frv/mb93090-mb00/pci-vdk.c | 55 +-- arch/ia64/pci/pci.c | 44 +-- arch/mips/pci/pci.c | 40 +-- arch/mn10300/unit-asb2305/pci-asb2305.c | 39 -- arch/mn10300/unit-asb2305/pci-asb2305.h | 3 - arch/mn10300/unit-asb2305/pci.c | 2 +- arch/parisc/kernel/pci.c | 30 +- arch/powerpc/kernel/pci-common.c | 34 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- arch/ppc/kernel/pci.c | 59 +-- arch/sh/drivers/pci/pci-sh4.h | 2 - arch/sh/drivers/pci/pci.c | 29 +- arch/sparc64/kernel/pci.c | 27 +- arch/v850/kernel/rte_mb_a_pci.c | 25 +- arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/pci/acpi.c | 11 +- arch/x86/pci/common.c | 63 +-- arch/x86/pci/i386.c | 38 -- arch/x86/pci/pcbios.c | 72 --- arch/x86/pci/pci.h | 4 - arch/xtensa/kernel/pci.c | 57 +-- drivers/ide/Kconfig | 9 +- drivers/ide/ide-scan-pci.c | 9 +- drivers/ide/ide.c | 12 - drivers/parisc/dino.c | 1 - drivers/pci/access.c | 166 +++++ drivers/pci/bus.c | 15 +- drivers/pci/hotplug/Kconfig | 4 +- drivers/pci/hotplug/acpi_pcihp.c | 24 +- drivers/pci/hotplug/acpiphp_core.c | 18 +- drivers/pci/hotplug/acpiphp_glue.c | 38 +- drivers/pci/hotplug/acpiphp_ibm.c | 36 +- drivers/pci/hotplug/cpci_hotplug_core.c | 60 +- drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- drivers/pci/hotplug/cpcihp_generic.c | 8 +- drivers/pci/hotplug/cpqphp.h | 6 +- drivers/pci/hotplug/cpqphp_core.c | 38 +- drivers/pci/hotplug/cpqphp_ctrl.c | 64 +- drivers/pci/hotplug/cpqphp_nvram.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 8 +- drivers/pci/hotplug/fakephp.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 24 +- drivers/pci/hotplug/ibmphp_ebda.c | 92 ++-- drivers/pci/hotplug/ibmphp_hpc.c | 68 +- drivers/pci/hotplug/ibmphp_pci.c | 18 +- drivers/pci/hotplug/ibmphp_res.c | 12 +- drivers/pci/hotplug/pci_hotplug_core.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_core.c | 32 +- drivers/pci/hotplug/pciehp_ctrl.c | 34 +- drivers/pci/hotplug/pciehp_hpc.c | 144 +++--- drivers/pci/hotplug/pciehp_pci.c | 8 +- drivers/pci/hotplug/pcihp_skeleton.c | 18 +- drivers/pci/hotplug/rpadlpar_core.c | 20 +- drivers/pci/hotplug/rpaphp_core.c | 6 +- drivers/pci/hotplug/rpaphp_pci.c | 14 +- drivers/pci/hotplug/rpaphp_slot.c | 6 +- drivers/pci/hotplug/sgi_hotplug.c | 8 +- drivers/pci/hotplug/shpchp.h | 6 +- drivers/pci/hotplug/shpchp_core.c | 26 +- drivers/pci/hotplug/shpchp_ctrl.c | 46 +- drivers/pci/hotplug/shpchp_hpc.c | 64 +- drivers/pci/hotplug/shpchp_pci.c | 4 +- drivers/pci/intel-iommu.c | 147 ++++- drivers/pci/iova.c | 50 +- drivers/pci/iova.h | 2 + drivers/pci/pci-sysfs.c | 114 +++- drivers/pci/pci.c | 6 +- drivers/pci/pci.h | 19 + drivers/pci/pcie/Kconfig | 20 + drivers/pci/pcie/Makefile | 3 + drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 3 + drivers/pci/pcie/aer/aerdrv_core.c | 5 +- drivers/pci/pcie/aspm.c | 811 ++++++++++++++++++++++++ drivers/pci/pcie/portdrv_core.c | 4 +- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 68 +-- drivers/pci/quirks.c | 4 +- drivers/pci/remove.c | 14 +- drivers/pci/search.c | 313 ++++------ drivers/pci/setup-res.c | 45 ++- include/asm-sh/mpc1211/pci.h | 2 - include/linux/aer.h | 5 - include/linux/ide.h | 1 - include/linux/pci-aspm.h | 56 ++ include/linux/pci.h | 30 +- include/linux/pci_regs.h | 8 + 103 files changed, 2153 insertions(+), 1595 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci create mode 100644 Documentation/PCI/00-INDEX rename Documentation/{ => PCI}/PCIEBUS-HOWTO.txt (98%) rename Documentation/{ => PCI}/pci-error-recovery.txt (100%) rename Documentation/{ => PCI}/pci.txt (99%) rename Documentation/{ => PCI}/pcieaer-howto.txt (99%) create mode 100644 drivers/pci/pcie/aspm.c create mode 100644 include/linux/pci-aspm.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch series ub-drop-bug-and-update-small-things.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-usb-serial-spcp8x5-driver.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-speed-handling.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-ftdi_sio-note-missing-locking.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-increase-cdc-acm-write-throughput.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-libusual-locking-cleanup.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-usb.h-reduce-syslog-clutter.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-use-div_round_up.patch usbmon-restore-mmap.patch sent 898549 bytes received 1522 bytes 600047.33 bytes/sec total size is 890314 speedup is 0.99 Using base gregkh-pci usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-reorganize-code-in-hub.c.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-remove-config_usb_persist-setting.patch usb-check-serial-number-string-after-device-reset.patch usb-enable-usb-persist-by-default.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-microtek-remove-unused-semaphore.patch usb-libusual-locking-cleanup.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ohci-port-reset-paranoia-timeout.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-misc-auerswald-cp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-minor-ehci-xitd-simplifications.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-ftdi_sio-note-missing-locking.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-use-div_round_up.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-partial-usb-embedded-host-support.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-remove-dev-power.power_state.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-cypress_m8-speed-handling.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch usb-usb.h-reduce-syslog-clutter.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch ub-drop-bug-and-update-small-things.patch usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-add-usb-serial-spcp8x5-driver.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-gotemp.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- drivers/block/ub.c | 76 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +++++--- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 14 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 ++-- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 6 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 ++-- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 72 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 7 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 7 +- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 29 +- drivers/usb/misc/Makefile | 1 + drivers/usb/misc/adutux.c | 120 ++-- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 ++-- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/gotemp.c | 295 +++++++ drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 ++-- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 ++-- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++++++------- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 ++-- drivers/usb/serial/garmin_gps.c | 112 ++-- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 ++++---- drivers/usb/serial/io_ti.c | 392 +++++----- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 ++-- drivers/usb/serial/keyspan.c | 262 +++--- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 ++-- drivers/usb/serial/mos7840.c | 159 ++-- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 ++-- drivers/usb/serial/pl2303.c | 112 ++-- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 66 +- drivers/usb/serial/spcp8x5.c | 1075 +++++++++++++++++++++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +++--- drivers/usb/serial/usb-serial.c | 89 ++- drivers/usb/serial/visor.c | 92 ++-- drivers/usb/serial/whiteheat.c | 110 ++-- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 +++++ drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 12 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 8 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 181 +++-- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 16 +- include/linux/usb/g_printer.h | 4 + include/linux/usb/gadget.h | 2 +- include/linux/usb/gadgetfs.h | 16 +- include/linux/usb/input.h | 8 +- include/linux/usb/iowarrior.h | 6 +- include/linux/usb/isp116x.h | 6 +- include/linux/usb/midi.h | 2 +- include/linux/usb/net2280.h | 9 +- include/linux/usb/otg.h | 6 +- include/linux/usb/quirks.h | 5 + include/linux/usb/rndis_host.h | 9 +- include/linux/usb/serial.h | 3 +- include/linux/usb/sl811.h | 5 +- include/linux/usb/usbnet.h | 8 +- include/linux/usb_usual.h | 1 + 159 files changed, 4940 insertions(+), 3187 deletions(-) create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/spcp8x5.c create mode 100644 drivers/usb/storage/cypress_atacb.c create mode 100644 drivers/usb/storage/cypress_atacb.h ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## BRANCH agp-patches not in tree /pub/scm/linux/kernel/git/airlied/agp-2.6.git, SKIPPING ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/usb/caiaq/caiaq-control.c | 4 +- 17 files changed, 264 insertions(+), 124 deletions(-) ## # skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## SKIPPING: skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Removed arch/avr32/mach-at32ap/time-tc.c Auto-merged drivers/misc/Kconfig Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/kernel/traps.c | 4 + arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 305 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.c | 126 +++++--------- include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/byteorder.h | 6 + include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/asm-avr32/processor.h | 2 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 29 files changed, 1278 insertions(+), 765 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Merge made by recursive. drivers/acpi/processor_thermal.c | 30 +++++---- drivers/cpufreq/cpufreq.c | 129 +++++++++++++++++--------------------- drivers/cpufreq/cpufreq_stats.c | 6 ++- 3 files changed, 78 insertions(+), 87 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Merge made by recursive. Documentation/powerpc/phyp-assisted-dump.txt | 127 +++++++ arch/powerpc/Kconfig | 11 + arch/powerpc/configs/maple_defconfig | 131 +++++++- arch/powerpc/kernel/asm-offsets.c | 4 - arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 - arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/ppc_ksyms.c | 2 +- arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/prom.c | 59 +++- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 11 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 5 - arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 26 ++- arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/mm/init_64.c | 2 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/iseries/pci.c | 3 +- arch/powerpc/platforms/maple/pci.c | 47 --- arch/powerpc/platforms/maple/setup.c | 4 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/lpar.c | 15 + arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++++++++++++++++ arch/powerpc/platforms/pseries/scanlog.c | 37 +- arch/powerpc/platforms/pseries/setup.c | 4 + arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 +- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/kernel/head.S | 17 - arch/sparc64/Kconfig | 1 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 ++++++++++++++--- drivers/net/pasemi_mac.h | 35 ++- drivers/net/pasemi_mac_ethtool.c | 159 ++++++++ include/asm-powerpc/Kbuild | 2 +- include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/lmb.h | 82 +---- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 ++++- include/asm-powerpc/phyp_dump.h | 45 +++ include/asm-powerpc/sparsemem.h | 1 + include/asm-sparc64/lmb.h | 10 + include/linux/lmb.h | 83 +++++ lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 ++++---- 62 files changed, 1867 insertions(+), 368 deletions(-) create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-powerpc/phyp_dump.h create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git devel dvb ## Merge made by recursive. Documentation/video4linux/CARDLIST.bttv | 2 + Documentation/video4linux/CARDLIST.cx88 | 8 + Documentation/video4linux/CARDLIST.saa7134 | 7 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 7 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 53 +- drivers/media/common/saa7146_core.c | 8 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/Kconfig | 1 + drivers/media/dvb/b2c2/Makefile | 1 + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 6 +- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/bt8xx/Kconfig | 2 +- drivers/media/dvb/bt8xx/Makefile | 5 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 14 +- drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- drivers/media/dvb/dvb-core/demux.h | 2 + drivers/media/dvb/dvb-core/dmxdev.c | 10 +- drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 1 + drivers/media/dvb/dvb-usb/cxusb.c | 13 +- drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 260 +--- drivers/media/dvb/frontends/dvb-pll.h | 31 +- drivers/media/dvb/frontends/isl6405.c | 164 ++ drivers/media/dvb/frontends/isl6405.h | 74 + drivers/media/dvb/frontends/lgdt330x.c | 2 +- drivers/media/dvb/frontends/nxt6000.c | 2 +- drivers/media/dvb/frontends/s5h1409.c | 2 +- drivers/media/dvb/frontends/s5h1420.c | 2 +- drivers/media/dvb/frontends/sp8870.c | 12 +- drivers/media/dvb/frontends/tda1004x.h | 1 - drivers/media/dvb/frontends/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 57 +- drivers/media/dvb/frontends/tda18271-fe.c | 395 ++--- drivers/media/dvb/frontends/tda18271-priv.h | 16 +- drivers/media/dvb/frontends/tda18271-tables.c | 84 +- drivers/media/dvb/frontends/tda18271.h | 23 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 167 +- drivers/media/dvb/frontends/tda827x.h | 4 +- drivers/media/dvb/frontends/ves1x93.c | 2 +- drivers/media/dvb/frontends/xc5000.c | 2 +- drivers/media/dvb/frontends/zl10353.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- drivers/media/radio/dsbr100.c | 2 + drivers/media/radio/miropcm20-radio.c | 2 + drivers/media/radio/miropcm20-rds.c | 2 +- drivers/media/radio/radio-aimslab.c | 2 + drivers/media/radio/radio-aztech.c | 2 + drivers/media/radio/radio-cadet.c | 12 +- drivers/media/radio/radio-gemtek-pci.c | 2 + drivers/media/radio/radio-gemtek.c | 2 + drivers/media/radio/radio-maestro.c | 2 + drivers/media/radio/radio-maxiradio.c | 2 + drivers/media/radio/radio-rtrack2.c | 2 + drivers/media/radio/radio-sf16fmi.c | 2 + drivers/media/radio/radio-sf16fmr2.c | 104 +- drivers/media/radio/radio-si470x.c | 59 +- drivers/media/radio/radio-terratec.c | 2 + drivers/media/radio/radio-trust.c | 2 + drivers/media/radio/radio-typhoon.c | 4 +- drivers/media/radio/radio-zoltrix.c | 2 + drivers/media/video/Kconfig | 45 + drivers/media/video/Makefile | 8 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 6 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 55 +- drivers/media/video/bt8xx/bttv-driver.c | 43 +- drivers/media/video/bt8xx/bttv-input.c | 6 + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 3 + drivers/media/video/bt8xx/bttvp.h | 1 - drivers/media/video/bw-qcam.c | 6 +- drivers/media/video/c-qcam.c | 6 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia.c | 2 + drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cpia2/cpia2_v4l.c | 2 + drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 15 +- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx25840/cx25840-core.c | 91 +- drivers/media/video/cx25840/cx25840-core.h | 2 +- drivers/media/video/cx25840/cx25840-firmware.c | 11 +- drivers/media/video/cx25840/cx25840-vbi.c | 6 +- drivers/media/video/cx88/Kconfig | 1 + drivers/media/video/cx88/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 6 +- drivers/media/video/cx88/cx88-cards.c | 529 ++++++- drivers/media/video/cx88/cx88-core.c | 8 +- drivers/media/video/cx88/cx88-dvb.c | 220 +++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 9 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 17 +- drivers/media/video/cx88/cx88.h | 8 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/media/video/em28xx/em28xx-core.c | 24 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 4 +- drivers/media/video/hexium_gemini.c | 4 +- drivers/media/video/hexium_orion.c | 4 +- drivers/media/video/ir-kbd-i2c.c | 26 +- drivers/media/video/ivtv/ivtv-cards.c | 7 +- drivers/media/video/ivtv/ivtv-cards.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 44 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-queue.c | 4 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 14 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 9 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 844 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/ov511.c | 2 + drivers/media/video/pms.c | 6 +- drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 52 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 ++++- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 ++- drivers/media/video/pwc/pwc-if.c | 10 +- drivers/media/video/pxa_camera.c | 985 +++++++++++ drivers/media/video/saa5249.c | 2 + drivers/media/video/saa6588.c | 8 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7111.c | 2 +- drivers/media/video/saa7114.c | 2 +- drivers/media/video/saa7115.c | 4 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/Kconfig | 1 + drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 347 ++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 367 +++-- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-reg.h | 3 + drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 17 +- drivers/media/video/saa7134/saa7134.h | 20 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 6 +- drivers/media/video/sn9c102/sn9c102_core.c | 6 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/soc_camera.c | 998 +++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 6 +- drivers/media/video/stv680.c | 11 +- drivers/media/video/tda8290.c | 12 +- drivers/media/video/tda8290.h | 2 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 42 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 47 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 861 ++++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 57 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 8 +- drivers/media/video/usbvideo/vicam.c | 2 + drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- drivers/media/video/videobuf-core.c | 7 +- drivers/media/video/videobuf-dma-sg.c | 121 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 6 +- drivers/media/video/w9968cf.c | 4 +- drivers/media/video/zc0301/zc0301_core.c | 4 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_device.c | 5 +- drivers/media/video/zoran_driver.c | 4 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/ir-common.h | 1 + include/media/soc_camera.h | 173 ++ include/media/tuner-types.h | 17 +- include/media/tuner.h | 2 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-core.h | 4 +- include/media/videobuf-dma-sg.h | 14 +- 243 files changed, 9637 insertions(+), 2961 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## Using base 2.6.25-rc7 i2c-new-co-maintainer.patch i2c-ibm_iic-fast-mode-parm-desc-fixup.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-bfin-twi-01-add-repeated-start.patch i2c-bfin-twi-02-support-multiport-controllers.patch i2c-bfin-twi-03-add-pin-mux-operation.patch i2c-bfin-twi-04-driver-description.patch i2c-bfin-twi-05-use-simpler-comment-headers.patch i2c-bfin-twi-06-add-ADSP-BF52x-support.patch i2c-bfin-twi-07-fix-mismatch-in-add-timer-and-delete-timer.patch i2c-isp1301_omap-convert-to-new-style-1.patch ## # merge i2c ## Auto-merged MAINTAINERS Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. MAINTAINERS | 2 + drivers/i2c/algos/Kconfig | 39 +-- drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- drivers/i2c/algos/i2c-algo-pca.h | 26 -- drivers/i2c/busses/Kconfig | 63 +++-- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-bfin-twi.c | 474 +++++++++++++++++---------- drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 199 +++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/chips/isp1301_omap.c | 87 +++--- drivers/i2c/i2c-core.c | 2 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- include/linux/i2c-pca-platform.h | 12 + 22 files changed, 1805 insertions(+), 603 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-pca-platform.c create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h create mode 100644 include/linux/i2c-pca-platform.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/hid-quirks.c Merge made by recursive. drivers/hid/hid-core.c | 4 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 22 +++- drivers/hid/usbhid/hid-core.c | 40 ++++--- drivers/hid/usbhid/hid-quirks.c | 54 ++++++++ drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- include/linux/hid.h | 5 +- 7 files changed, 256 insertions(+), 157 deletions(-) ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Merge made by recursive. drivers/input/apm-power.c | 7 ++----- drivers/input/keyboard/pxa27x_keypad.c | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus jfs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/sam/kbuild.git master kbuild ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Auto-merged arch/x86/kernel/setup_32.c Auto-merged arch/x86/kernel/setup_64.c Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 18 + arch/x86/kernel/Makefile | 2 + arch/x86/kernel/crash.c | 3 +- arch/x86/kernel/kvm.c | 247 ++++++++++++ arch/x86/kernel/kvmclock.c | 187 +++++++++ arch/x86/kernel/reboot.c | 13 +- arch/x86/kernel/setup_32.c | 6 + arch/x86/kernel/setup_64.c | 7 + arch/x86/kvm/Kconfig | 2 +- arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c | 600 ++++++++++++++++++++++++++++ arch/x86/kvm/i8254.h | 62 +++ arch/x86/kvm/irq.c | 3 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 8 +- arch/x86/kvm/mmu.c | 572 +++++++++++++++++++++++---- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 70 ++-- arch/x86/kvm/segment_descriptor.h | 29 -- arch/x86/kvm/svm.c | 250 +++++++++--- arch/x86/kvm/svm.h | 3 + arch/x86/kvm/tss.h | 59 +++ arch/x86/kvm/vmx.c | 170 +++++++-- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 796 +++++++++++++++++++++++++++++++++---- arch/x86/kvm/x86_emulate.c | 256 +++++++------ include/asm-x86/kvm.h | 21 + include/asm-x86/kvm_host.h | 70 +++- include/asm-x86/kvm_para.h | 55 +++ include/asm-x86/reboot.h | 2 + include/linux/kvm.h | 10 + include/linux/kvm_host.h | 23 +- include/linux/kvm_para.h | 11 +- virt/kvm/kvm_main.c | 91 ++++- 34 files changed, 3206 insertions(+), 461 deletions(-) create mode 100644 arch/x86/kernel/kvm.c create mode 100644 arch/x86/kernel/kvmclock.c create mode 100644 arch/x86/kvm/i8254.c create mode 100644 arch/x86/kvm/i8254.h delete mode 100644 arch/x86/kvm/segment_descriptor.h create mode 100644 arch/x86/kvm/tss.h ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merged drivers/ata/ahci.c Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/scsi/ipr.c Auto-merged include/linux/libata.h Merge made by recursive. drivers/ata/ahci.c | 177 +++++-------------------- drivers/ata/ata_generic.c | 49 +------- drivers/ata/ata_piix.c | 185 +++----------------------- drivers/ata/libata-core.c | 157 ++++++++++++++++++---- drivers/ata/libata-eh.c | 139 +++++++++----------- drivers/ata/libata-pmp.c | 104 ++++----------- drivers/ata/libata-scsi.c | 7 +- drivers/ata/libata-sff.c | 66 +++++----- drivers/ata/pata_acpi.c | 71 +--------- drivers/ata/pata_ali.c | 161 ++++------------------- drivers/ata/pata_amd.c | 256 ++++++------------------------------ drivers/ata/pata_artop.c | 121 ++--------------- drivers/ata/pata_at32.c | 44 +------ drivers/ata/pata_atiixp.c | 55 +------- drivers/ata/pata_bf54x.c | 33 +---- drivers/ata/pata_cmd640.c | 73 ++++------- drivers/ata/pata_cmd64x.c | 135 ++++--------------- drivers/ata/pata_cs5520.c | 58 +++------ drivers/ata/pata_cs5530.c | 70 ++++------- drivers/ata/pata_cs5535.c | 50 +------- drivers/ata/pata_cs5536.c | 50 +------- drivers/ata/pata_cypress.c | 50 +------- drivers/ata/pata_efar.c | 64 +-------- drivers/ata/pata_hpt366.c | 75 ++++-------- drivers/ata/pata_hpt37x.c | 237 +++++++-------------------------- drivers/ata/pata_hpt3x2n.c | 77 +++--------- drivers/ata/pata_hpt3x3.c | 50 +------- drivers/ata/pata_icside.c | 59 ++------- drivers/ata/pata_isapnp.c | 37 +----- drivers/ata/pata_it8213.c | 65 +-------- drivers/ata/pata_it821x.c | 91 ++++---------- drivers/ata/pata_ixp4xx_cf.c | 40 +----- drivers/ata/pata_jmicron.c | 66 +--------- drivers/ata/pata_legacy.c | 276 +++------------------------------------ drivers/ata/pata_marvell.c | 67 +--------- drivers/ata/pata_mpc52xx.c | 42 +------ drivers/ata/pata_mpiix.c | 55 +------- drivers/ata/pata_netcell.c | 56 ++------- drivers/ata/pata_ninja32.c | 46 +------ drivers/ata/pata_ns87410.c | 60 +-------- drivers/ata/pata_ns87415.c | 94 +++----------- drivers/ata/pata_oldpiix.c | 66 +--------- drivers/ata/pata_opti.c | 64 +--------- drivers/ata/pata_optidma.c | 101 ++------------- drivers/ata/pata_pcmcia.c | 64 +-------- drivers/ata/pata_pdc2027x.c | 89 +------------ drivers/ata/pata_pdc202xx_old.c | 96 +++----------- drivers/ata/pata_platform.c | 44 +------ drivers/ata/pata_qdi.c | 63 +-------- drivers/ata/pata_radisys.c | 51 +------- drivers/ata/pata_rb500_cf.c | 44 +------ drivers/ata/pata_rz1000.c | 49 +------- drivers/ata/pata_sc1200.c | 53 +------- drivers/ata/pata_scc.c | 38 +----- drivers/ata/pata_serverworks.c | 104 +++------------ drivers/ata/pata_sil680.c | 63 ++------- drivers/ata/pata_sis.c | 228 ++++---------------------------- drivers/ata/pata_sl82c105.c | 65 ++-------- drivers/ata/pata_triflex.c | 56 +------- drivers/ata/pata_via.c | 130 ++++--------------- drivers/ata/pata_winbond.c | 41 +----- drivers/ata/pdc_adma.c | 50 ++----- drivers/ata/sata_fsl.c | 39 +----- drivers/ata/sata_inic162x.c | 45 +----- drivers/ata/sata_mv.c | 150 ++++----------------- drivers/ata/sata_nv.c | 213 +++++++----------------------- drivers/ata/sata_promise.c | 98 +++----------- drivers/ata/sata_qstor.c | 46 ++----- drivers/ata/sata_sil.c | 41 +------ drivers/ata/sata_sil24.c | 116 +++++++---------- drivers/ata/sata_sis.c | 38 +----- drivers/ata/sata_svw.c | 33 +----- drivers/ata/sata_sx4.c | 17 +-- drivers/ata/sata_uli.c | 43 +------ drivers/ata/sata_via.c | 112 ++-------------- drivers/ata/sata_vsc.c | 34 +----- drivers/scsi/ipr.c | 3 +- include/linux/libata.h | 249 ++++++++++++++++++++++------------- 78 files changed, 1314 insertions(+), 5190 deletions(-) ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## ## # revert a1dcf69bd2f16de76f530c80c11d1356b13f5423 infiniband ## Auto-merged drivers/infiniband/hw/amso1100/c2_qp.c Auto-merged drivers/infiniband/hw/amso1100/c2_rnic.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/nes/nes.c Auto-merged drivers/infiniband/hw/nes/nes.h Auto-merged drivers/infiniband/hw/nes/nes_cm.c Auto-merged drivers/infiniband/hw/nes/nes_hw.c Auto-merged drivers/infiniband/hw/nes/nes_nic.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c Created commit fe7e2bc: Revert "IB: Replace remaining __FUNCTION__ occurrences with __func__" 26 files changed, 302 insertions(+), 302 deletions(-) ## # merge infiniband resolve /home/jejb/infiniband-fixup.diff ## Auto-merged drivers/infiniband/core/uverbs.h Auto-merged drivers/infiniband/core/uverbs_main.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c Auto-merged drivers/infiniband/hw/mlx4/main.c Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c Auto-merged drivers/infiniband/ulp/srp/ib_srp.c Auto-merged include/rdma/ib_verbs.h Created commit 447792d: Resolve Patch: /home/jejb/infiniband-fixup.diff ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release acpi ## Merge made by recursive. drivers/acpi/fan.c | 34 ++++++++++++++++------------------ drivers/acpi/processor_core.c | 30 ++++++++++++++---------------- drivers/acpi/processor_idle.c | 7 +++++-- drivers/acpi/sbshc.c | 1 - drivers/acpi/scan.c | 18 ++++++++++++------ drivers/acpi/video.c | 28 +++++++++++++--------------- drivers/cpuidle/cpuidle.c | 4 ++-- drivers/cpuidle/sysfs.c | 10 ++++++++-- drivers/pnp/pnpacpi/rsparser.c | 8 ++++---- include/linux/cpuidle.h | 4 ++-- 10 files changed, 76 insertions(+), 68 deletions(-) ## # git /home/rmk/linux-2.6-arm.git for-linus arm-for-linus ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git master arm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus ieee1394-for-linus ## Merge made by recursive. drivers/firewire/fw-ohci.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master ieee1394 ## Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 13 +- drivers/firewire/Kconfig | 5 + drivers/firewire/fw-card.c | 40 +---- drivers/firewire/fw-cdev.c | 13 +- drivers/firewire/fw-device.c | 263 ++++++++++++++++++++----- drivers/firewire/fw-device.h | 38 +++- drivers/firewire/fw-ohci.c | 320 ++++++++++++++++++++++++------ drivers/firewire/fw-ohci.h | 1 + drivers/firewire/fw-sbp2.c | 150 +++++++-------- drivers/firewire/fw-topology.c | 15 ++ drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 62 +++--- drivers/firewire/fw-transaction.h | 6 - drivers/ieee1394/csr.c | 6 +- drivers/ieee1394/dv1394.c | 3 +- drivers/ieee1394/highlevel.c | 6 +- drivers/ieee1394/ieee1394_core.c | 2 +- drivers/ieee1394/nodemgr.c | 6 +- drivers/ieee1394/ohci1394.c | 117 +++++------ drivers/ieee1394/pcilynx.c | 15 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 + 24 files changed, 733 insertions(+), 384 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-fixes-for-linus iop-fixes ## Already up-to-date. ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Auto-merged crypto/async_tx/async_tx.c Auto-merged crypto/async_tx/async_xor.c Auto-merged drivers/dma/dmaengine.c Auto-merged drivers/dma/fsldma.c Auto-merged drivers/dma/iop-adma.c Merge made by recursive. crypto/async_tx/async_tx.c | 197 ++++++++++++++++++++++++++------ drivers/dma/dmaengine.c | 3 - drivers/dma/fsldma.c | 8 -- drivers/dma/ioat_dma.c | 12 -- drivers/dma/iop-adma.c | 21 +--- include/asm-arm/arch-iop13xx/adma.h | 5 - include/asm-arm/hardware/iop3xx-adma.h | 8 -- include/asm-arm/hardware/iop_adma.h | 2 - include/linux/dmaengine.h | 11 +-- 9 files changed, 170 insertions(+), 97 deletions(-) ## # git /pub/scm/linux/kernel/git/ralf/linux.git master mips ## Auto-merged drivers/net/Makefile Merge made by recursive. Makefile | 3 +- arch/mips/Makefile | 7 +- arch/mips/kernel/i8253.c | 1 + arch/mips/kernel/time.c | 2 +- arch/mips/kernel/vpe.c | 21 +- arch/mips/pci/pci-bcm1480.c | 6 +- arch/mips/pci/pci-bcm1480ht.c | 21 +- drivers/net/Kconfig | 7 + drivers/net/Makefile | 2 + drivers/net/titan_ge.c | 2069 +++++++++++++++++++++++++++++++++++++++++ drivers/net/titan_ge.h | 415 +++++++++ drivers/net/titan_mdio.c | 217 +++++ drivers/net/titan_mdio.h | 56 ++ 13 files changed, 2801 insertions(+), 26 deletions(-) create mode 100644 drivers/net/titan_ge.c create mode 100644 drivers/net/titan_ge.h create mode 100644 drivers/net/titan_mdio.c create mode 100644 drivers/net/titan_mdio.h ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-linus mmc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-andrew mmc-devel ## Merge made by recursive. drivers/mmc/core/host.c | 39 ++- drivers/mmc/host/Kconfig | 18 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pci.c | 773 ++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.c | 544 ++++++++---------------------- drivers/mmc/host/sdhci.h | 90 ++++-- include/linux/pci_ids.h | 1 + 7 files changed, 1011 insertions(+), 455 deletions(-) create mode 100644 drivers/mmc/host/sdhci-pci.c ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Merge made by recursive. drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- fs/jffs2/fs.c | 14 +++++++++++--- 2 files changed, 28 insertions(+), 18 deletions(-) ## # gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.26.git master net ## ## # merge net resolve /home/jejb/net-fixup.diff ## Auto-merged Documentation/feature-removal-schedule.txt Removed Documentation/networking/bcm43xx.txt Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged drivers/net/Kconfig Auto-merged drivers/net/Makefile Removed drivers/net/atl1/Makefile Removed drivers/net/atl1/atl1.h Removed drivers/net/atl1/atl1_ethtool.c Removed drivers/net/atl1/atl1_hw.c Removed drivers/net/atl1/atl1_hw.h Removed drivers/net/atl1/atl1_param.c Removed drivers/net/sk98lin/Makefile Removed drivers/net/sk98lin/h/lm80.h Removed drivers/net/sk98lin/h/skaddr.h Removed drivers/net/sk98lin/h/skcsum.h Removed drivers/net/sk98lin/h/skdebug.h Removed drivers/net/sk98lin/h/skdrv1st.h Removed drivers/net/sk98lin/h/skdrv2nd.h Removed drivers/net/sk98lin/h/skerror.h Removed drivers/net/sk98lin/h/skgedrv.h Removed drivers/net/sk98lin/h/skgehw.h Removed drivers/net/sk98lin/h/skgehwt.h Removed drivers/net/sk98lin/h/skgei2c.h Removed drivers/net/sk98lin/h/skgeinit.h Removed drivers/net/sk98lin/h/skgepnm2.h Removed drivers/net/sk98lin/h/skgepnmi.h Removed drivers/net/sk98lin/h/skgesirq.h Removed drivers/net/sk98lin/h/ski2c.h Removed drivers/net/sk98lin/h/skqueue.h Removed drivers/net/sk98lin/h/skrlmt.h Removed drivers/net/sk98lin/h/sktimer.h Removed drivers/net/sk98lin/h/sktypes.h Removed drivers/net/sk98lin/h/skversion.h Removed drivers/net/sk98lin/h/skvpd.h Removed drivers/net/sk98lin/h/xmac_ii.h Removed drivers/net/sk98lin/skaddr.c Removed drivers/net/sk98lin/skdim.c Removed drivers/net/sk98lin/skethtool.c Removed drivers/net/sk98lin/skge.c Removed drivers/net/sk98lin/skgehwt.c Removed drivers/net/sk98lin/skgeinit.c Removed drivers/net/sk98lin/skgemib.c Removed drivers/net/sk98lin/skgepnmi.c Removed drivers/net/sk98lin/skgesirq.c Removed drivers/net/sk98lin/ski2c.c Removed drivers/net/sk98lin/sklm80.c Removed drivers/net/sk98lin/skqueue.c Removed drivers/net/sk98lin/skrlmt.c Removed drivers/net/sk98lin/sktimer.c Removed drivers/net/sk98lin/skvpd.c Removed drivers/net/sk98lin/skxmac2.c Removed drivers/net/tulip/xircom_tulip_cb.c Removed drivers/net/wireless/bcm43xx/Kconfig Removed drivers/net/wireless/bcm43xx/Makefile Removed drivers/net/wireless/bcm43xx/bcm43xx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h Removed drivers/net/wireless/rt2x00/rt2x00ring.h Removed drivers/s390/net/ctcdbug.c Removed drivers/s390/net/ctcdbug.h Removed drivers/s390/net/ctcmain.c Removed drivers/s390/net/ctcmain.h Removed drivers/s390/net/qeth_fs.h Removed drivers/s390/net/qeth_main.c Removed drivers/s390/net/qeth_mpc.c Removed drivers/s390/net/qeth_proc.c Removed drivers/s390/net/qeth_sys.c Removed drivers/s390/net/qeth_tso.h Removed include/net/ieee80211softmac.h Removed include/net/ieee80211softmac_wx.h Auto-merged net/core/sock.c Removed net/ieee80211/softmac/Kconfig Removed net/ieee80211/softmac/Makefile Removed net/ieee80211/softmac/ieee80211softmac_assoc.c Removed net/ieee80211/softmac/ieee80211softmac_auth.c Removed net/ieee80211/softmac/ieee80211softmac_event.c Removed net/ieee80211/softmac/ieee80211softmac_io.c Removed net/ieee80211/softmac/ieee80211softmac_module.c Removed net/ieee80211/softmac/ieee80211softmac_priv.h Removed net/ieee80211/softmac/ieee80211softmac_scan.c Removed net/ieee80211/softmac/ieee80211softmac_wx.c Removed net/mac80211/rc80211_simple.c Removed net/mac80211/regdomain.c Created commit d91d821: Resolve Patch: /home/jejb/net-fixup.diff ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Auto-merged fs/nfs/super.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/clnt.c Auto-merged net/sunrpc/rpcb_clnt.c Auto-merged net/sunrpc/xprtsock.c Merge made by recursive. fs/Kconfig | 70 +++++------ fs/lockd/host.c | 20 ++-- fs/lockd/mon.c | 113 +++++++++++++---- fs/lockd/svc.c | 12 ++ fs/nfs/Makefile | 3 +- fs/nfs/client.c | 16 +++ fs/nfs/dir.c | 2 +- fs/nfs/direct.c | 9 +- fs/nfs/file.c | 6 - fs/nfs/inode.c | 45 +++++++- fs/nfs/internal.h | 13 +-- fs/nfs/nfs2xdr.c | 37 +++++-- fs/nfs/nfs3xdr.c | 37 +++++-- fs/nfs/nfs4proc.c | 18 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/nfs4xdr.c | 39 +++++-- fs/nfs/read.c | 18 +-- fs/nfs/super.c | 130 +++++++++++++------- fs/nfs/unlink.c | 2 +- fs/nfs/write.c | 86 +++++++------ include/linux/lockd/lockd.h | 17 ++-- include/linux/lockd/sm_inter.h | 1 + include/linux/nfs_fs_sb.h | 8 ++ include/linux/sunrpc/auth.h | 13 ++- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/Makefile | 2 +- net/sunrpc/auth.c | 63 ++++++---- net/sunrpc/auth_generic.c | 157 ++++++++++++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 7 +- net/sunrpc/auth_null.c | 1 + net/sunrpc/auth_unix.c | 57 ++++----- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 264 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 37 files changed, 888 insertions(+), 498 deletions(-) create mode 100644 net/sunrpc/auth_generic.c ## # git git://git.linux-nfs.org/~bfields/linux.git for-linus nfsd-for-linus ## Already up-to-date. ## # git git://git.linux-nfs.org/~bfields/linux.git for-2.6.26 nfsd ## Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfsctl.c Auto-merged include/net/ipv6.h Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svcauth_unix.c Merge made by recursive. fs/nfs/symlink.c | 1 - fs/nfsd/export.c | 9 ++- fs/nfsd/nfsctl.c | 15 +++++- include/linux/nfs3.h | 2 +- include/linux/sunrpc/svcauth.h | 4 +- include/net/ipv6.h | 9 +++ net/sunrpc/auth_gss/auth_gss.c | 39 ++++++++----- net/sunrpc/svcauth_unix.c | 118 +++++++++++++++++++++++++++------------- 8 files changed, 135 insertions(+), 62 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390-linus ## Merge made by recursive. arch/s390/kernel/compat_signal.c | 10 ++++++++++ arch/s390/kernel/signal.c | 10 ++++++++++ drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 1 + drivers/s390/char/sclp_tty.c | 2 +- drivers/s390/char/sclp_vt220.c | 13 ++++++------- drivers/s390/cio/chsc.c | 12 ++++++++++-- drivers/s390/cio/css.c | 5 +++++ drivers/s390/cio/css.h | 1 + drivers/s390/cio/device_ops.c | 9 ++++++++- drivers/s390/cio/device_status.c | 6 +++++- include/asm-s390/tlbflush.h | 33 +++++++++++++++++++++------------ 12 files changed, 79 insertions(+), 24 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features s390 ## Auto-merged arch/s390/defconfig Auto-merged fs/Kconfig Auto-merged mm/hugetlb.c Merge made by recursive. arch/s390/Kconfig | 4 + arch/s390/defconfig | 4 +- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/early.c | 14 ++ arch/s390/kernel/head64.S | 12 ++- arch/s390/kernel/setup.c | 32 ++-- arch/s390/kernel/smp.c | 87 +++++++++- arch/s390/kernel/time.c | 2 +- arch/s390/kernel/topology.c | 316 +++++++++++++++++++++++++++++++++++ arch/s390/mm/Makefile | 2 +- arch/s390/mm/fault.c | 3 + arch/s390/mm/hugetlbpage.c | 134 +++++++++++++++ arch/s390/mm/init.c | 23 --- arch/s390/mm/vmem.c | 55 ++++++- drivers/base/topology.c | 17 +- drivers/char/hw_random/core.c | 4 + drivers/crypto/Kconfig | 1 + drivers/s390/block/dasd_3990_erp.c | 34 ++++ drivers/s390/block/dasd_eckd.c | 7 + drivers/s390/block/dasd_int.h | 6 + drivers/s390/crypto/zcrypt_api.c | 120 +++++++++++++ drivers/s390/crypto/zcrypt_api.h | 8 + drivers/s390/crypto/zcrypt_pcixcc.c | 199 ++++++++++++++++++++++- drivers/s390/sysinfo.c | 116 ++----------- fs/Kconfig | 3 +- include/asm-s390/page.h | 29 +++- include/asm-s390/pgtable.h | 158 +++++++++++++++++ include/asm-s390/setup.h | 4 + include/asm-s390/smp.h | 3 + include/asm-s390/sysinfo.h | 117 +++++++++++++ include/asm-s390/system.h | 12 ++ include/asm-s390/timex.h | 12 +- include/asm-s390/tlbflush.h | 1 + include/asm-s390/topology.h | 25 +++ include/linux/hugetlb.h | 22 +++ mm/hugetlb.c | 37 +++-- 36 files changed, 1435 insertions(+), 190 deletions(-) create mode 100644 arch/s390/kernel/topology.c create mode 100644 arch/s390/mm/hugetlbpage.c create mode 100644 include/asm-s390/sysinfo.h ## # git git://git.o-hand.com/linux-rpurdie-backlight for-linus backlight ## Already up-to-date. ## # git git://git.infradead.org/battery-2.6 master battery ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git ALL ocfs2 ## Auto-merged Documentation/feature-removal-schedule.txt Auto-merged MAINTAINERS Auto-merged fs/Kconfig Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 11 + MAINTAINERS | 1 + fs/Kconfig | 26 + fs/ocfs2/Makefile | 14 +- fs/ocfs2/alloc.c | 465 +++++++++++++-- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 51 ++- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dlm/dlmcommon.h | 49 ++ fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- fs/ocfs2/dlm/dlmdebug.h | 86 +++ fs/ocfs2/dlm/dlmdomain.c | 70 ++- fs/ocfs2/dlm/dlmlock.c | 22 +- fs/ocfs2/dlm/dlmmaster.c | 200 ++----- fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- fs/ocfs2/dlmglue.h | 5 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/heartbeat.c | 184 +------ fs/ocfs2/heartbeat.h | 17 +- fs/ocfs2/ioctl.c | 13 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/journal.c | 211 ++++++- fs/ocfs2/journal.h | 4 + fs/ocfs2/localalloc.c | 4 + fs/ocfs2/namei.c | 4 +- fs/ocfs2/ocfs2.h | 77 ++- fs/ocfs2/ocfs2_fs.h | 79 +++- fs/ocfs2/ocfs2_lockid.h | 2 +- fs/ocfs2/slot_map.c | 454 +++++++++++--- fs/ocfs2/slot_map.h | 32 +- fs/ocfs2/stack_o2cb.c | 420 +++++++++++++ fs/ocfs2/stack_user.c | 883 +++++++++++++++++++++++++++ fs/ocfs2/stackglue.c | 568 +++++++++++++++++ fs/ocfs2/stackglue.h | 261 ++++++++ fs/ocfs2/suballoc.c | 103 +++- fs/ocfs2/suballoc.h | 1 + fs/ocfs2/super.c | 208 ++++--- fs/sysfs/symlink.c | 9 +- 40 files changed, 5120 insertions(+), 1009 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb create mode 100644 fs/ocfs2/dlm/dlmdebug.h create mode 100644 fs/ocfs2/stack_o2cb.c create mode 100644 fs/ocfs2/stack_user.c create mode 100644 fs/ocfs2/stackglue.c create mode 100644 fs/ocfs2/stackglue.h ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-akpm selinux ## Auto-merged security/commoncap.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c Auto-merged security/selinux/include/security.h Merge made by recursive. security/commoncap.c | 4 +- security/keys/internal.h | 8 +- security/root_plug.c | 2 +- security/security.c | 8 +- security/selinux/avc.c | 4 +- security/selinux/hooks.c | 135 ++++++++++++++++++-------- security/selinux/include/av_perm_to_string.h | 5 + security/selinux/include/av_permissions.h | 5 + security/selinux/include/netlabel.h | 16 --- security/selinux/include/objsec.h | 9 -- security/selinux/include/security.h | 2 + security/selinux/netlabel.c | 82 +++------------- security/selinux/netlink.c | 2 +- security/selinux/selinuxfs.c | 11 +- security/selinux/ss/avtab.c | 40 ++++---- security/selinux/ss/conditional.c | 16 ++-- security/selinux/ss/ebitmap.c | 14 ++-- security/selinux/ss/policydb.c | 54 +++++----- security/selinux/ss/services.c | 35 ++++--- 19 files changed, 221 insertions(+), 231 deletions(-) ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## Merge made by recursive. arch/sh/Kconfig | 19 +- arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 1 + arch/sh/boards/renesas/migor/setup.c | 197 +++++- arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +- arch/sh/boards/renesas/r7780rp/setup.c | 42 +- arch/sh/boards/se/7721/Makefile | 1 + arch/sh/boards/se/7721/irq.c | 45 ++ arch/sh/boards/se/7721/setup.c | 99 +++ arch/sh/boards/se/7722/setup.c | 41 + arch/sh/configs/se7721_defconfig | 1085 ++++++++++++++++++++++++++ arch/sh/kernel/cf-enabler.c | 15 +- arch/sh/kernel/cpu/sh2a/Makefile | 7 +- arch/sh/kernel/cpu/sh2a/probe.c | 3 + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 168 ++++ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 28 +- arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 37 +- arch/sh/kernel/setup.c | 15 + arch/sh/lib/clear_page.S | 6 +- arch/sh/lib/copy_page.S | 6 +- arch/sh/mm/cache-debugfs.c | 4 +- arch/sh/mm/pmb.c | 2 +- arch/sh/tools/mach-types | 5 +- drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/sh_keysc.c | 280 +++++++ drivers/rtc/rtc-sh.c | 296 +++++--- include/asm-sh/bugs.h | 2 +- include/asm-sh/floppy.h | 6 +- include/asm-sh/migor.h | 58 ++ include/asm-sh/processor.h | 2 +- include/asm-sh/r7780rp.h | 22 +- include/asm-sh/se7721.h | 70 ++ include/asm-sh/se7722.h | 2 + include/asm-sh/sh_keysc.h | 13 + include/asm-sh/system.h | 2 + include/asm-sh/uaccess_32.h | 5 +- 37 files changed, 2465 insertions(+), 181 deletions(-) create mode 100644 arch/sh/boards/se/7721/Makefile create mode 100644 arch/sh/boards/se/7721/irq.c create mode 100644 arch/sh/boards/se/7721/setup.c create mode 100644 arch/sh/configs/se7721_defconfig create mode 100644 arch/sh/kernel/cpu/sh2a/setup-mxg.c create mode 100644 drivers/input/keyboard/sh_keysc.c create mode 100644 include/asm-sh/migor.h create mode 100644 include/asm-sh/se7721.h create mode 100644 include/asm-sh/sh_keysc.h ## # git /pub/scm/linux/kernel/git/ericvh/v9fs for-linus v9fs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ericvh/v9fs v9fs-devel v9fs-devel ## Auto-merged net/9p/error.c Auto-merged net/9p/trans_fd.c Merge made by recursive. fs/9p/fid.h | 15 +++ fs/9p/v9fs.c | 52 ++++++++-- fs/9p/v9fs.h | 85 +++++++++++----- fs/9p/vfs_addr.c | 2 +- fs/9p/vfs_dir.c | 2 +- fs/9p/vfs_file.c | 11 +- fs/9p/vfs_inode.c | 50 +++++++--- fs/9p/vfs_super.c | 1 + include/linux/parser.h | 2 +- include/net/9p/9p.h | 239 ++++++++++++++++++++++++++++++++++++++------ include/net/9p/client.h | 35 +++++++ include/net/9p/transport.h | 43 ++++++++ lib/parser.c | 32 ++++-- net/9p/client.c | 32 +++++-- net/9p/conv.c | 128 +++++++++++++++++++++++- net/9p/error.c | 11 ++- net/9p/fcprint.c | 8 ++ net/9p/mod.c | 7 +- net/9p/trans_fd.c | 175 +++++++++++++++++++++++++++------ net/9p/trans_virtio.c | 173 ++++++++++++++++++++++++++++---- net/9p/util.c | 32 +++++- 21 files changed, 966 insertions(+), 169 deletions(-) ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # git git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_export.c | 11 +- fs/xfs/linux-2.6/xfs_file.c | 13 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 676 ++++++++++++++++++--------------------- fs/xfs/linux-2.6/xfs_iops.c | 180 +++++------ fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 53 ++-- fs/xfs/linux-2.6/xfs_super.c | 22 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 12 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 14 +- fs/xfs/support/ktrace.c | 37 ++- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 41 ++-- fs/xfs/xfs_bmap_btree.c | 38 +++- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 46 ++- fs/xfs/xfs_iget.c | 49 +--- fs/xfs/xfs_inode.c | 661 ++++++++++++++++++++-------------------- fs/xfs/xfs_inode.h | 23 +-- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_inode_item.h | 8 + fs/xfs/xfs_itable.c | 5 +- fs/xfs/xfs_log.c | 61 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 22 +- fs/xfs/xfs_mount.c | 54 ++-- fs/xfs/xfs_mount.h | 26 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_rtalloc.c | 3 +- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans.h | 8 +- fs/xfs/xfs_trans_ail.c | 149 ++++------ fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 51 +--- fs/xfs/xfs_vnodeops.c | 328 +++++-------------- fs/xfs/xfs_vnodeops.h | 14 +- 44 files changed, 1261 insertions(+), 1636 deletions(-) ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Removed arch/xtensa/boot/ramdisk/Makefile Merge made by recursive. arch/xtensa/Kconfig | 65 ++++++++++++++++++++++++----------- arch/xtensa/Makefile | 68 +++++++++++++----------------------- arch/xtensa/boot/ramdisk/Makefile | 23 ------------ arch/xtensa/configs/iss_defconfig | 2 + arch/xtensa/mm/init.c | 1 - 5 files changed, 71 insertions(+), 88 deletions(-) delete mode 100644 arch/xtensa/boot/ramdisk/Makefile ## # skip gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## SKIPPING: skip gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## # skip merge x86 resolve /home/jejb/x86-fixup.diff ## SKIPPING: skip merge x86 resolve /home/jejb/x86-fixup.diff ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## 2.6.25-rc5-git2 to baadac8b10c5ac15ce3d26b68fa266c8889b163f Using base baadac8b10c5ac15ce3d26b68fa266c8889b163f docbook-audit-prms.patch docsrc-spi-split-fix.patch kconfig_allconfig_docv2.patch move-smart-config.patch kerndoc-dup-section-name-err.patch ## # merge doc ## Auto-merged Documentation/00-INDEX Auto-merged kernel/audit.c Auto-merged scripts/kernel-doc Merge made by recursive. Documentation/00-INDEX | 2 - Documentation/kbuild/00-INDEX | 4 + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ Documentation/{ => kbuild}/smart-config.txt | 2 +- Documentation/spi/spidev | 168 +----------------------- Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ README | 32 +++-- kernel/audit.c | 4 +- scripts/kernel-doc | 20 ++- 9 files changed, 388 insertions(+), 190 deletions(-) create mode 100644 Documentation/kbuild/make-configs.txt rename Documentation/{ => kbuild}/smart-config.txt (99%) create mode 100644 Documentation/spi/spidev_fdx.c ## # git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git testing lm-sensors ## Merge made by recursive. Documentation/hwmon/w83l785ts | 3 +- drivers/hwmon/adm1026.c | 22 ++++++--- drivers/hwmon/adm1029.c | 30 ++++++++----- drivers/hwmon/adm1031.c | 20 ++++++-- drivers/hwmon/adm9240.c | 20 ++++++--- drivers/hwmon/adt7470.c | 40 ++++++++++------- drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ drivers/hwmon/asb100.c | 20 +++++--- drivers/hwmon/dme1737.c | 5 ++ drivers/hwmon/f71805f.c | 5 ++ drivers/hwmon/f71882fg.c | 5 ++ drivers/hwmon/it87.c | 5 ++ drivers/hwmon/lm75.c | 5 +-- drivers/hwmon/pc87360.c | 6 +++ drivers/hwmon/pc87427.c | 5 ++ drivers/hwmon/sis5595.c | 5 ++ drivers/hwmon/smsc47b397.c | 22 ++++++++- drivers/hwmon/smsc47m1.c | 5 ++ drivers/hwmon/via686a.c | 5 ++ drivers/hwmon/vt1211.c | 5 ++ drivers/hwmon/vt8231.c | 5 ++ drivers/hwmon/w83627ehf.c | 6 +++ drivers/hwmon/w83627hf.c | 5 ++ drivers/hwmon/w83793.c | 26 ++++++----- drivers/hwmon/w83l785ts.c | 4 +- 25 files changed, 257 insertions(+), 121 deletions(-) ## # git git://git.infradead.org/~dedekind/ubi-2.6.git master ubi ## Merge made by recursive. Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ drivers/mtd/ubi/build.c | 18 +- drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/io.c | 4 + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- drivers/mtd/ubi/ubi.h | 3 +- include/mtd/Kbuild | 1 - 7 files changed, 231 insertions(+), 17 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-ubi rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) ## # git /pub/scm/linux/kernel/git/teigland/dlm.git next dlm ## Merge made by recursive. fs/dlm/config.c | 2 +- fs/dlm/lock.c | 5 ++--- fs/dlm/lock.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/kyle/parisc-2.6.git master parisc ## Merge made by recursive. arch/parisc/kernel/signal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus blackfinquilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ m68k ## Already up-to-date. ## # merge m68k ## MERGE m68k not in tree, SKIPPING ## # git /pub/scm/linux/kernel/git/tytso/ext4.git next ext4 ## Merge made by recursive. arch/arm/mm/mmu.c | 1 + arch/m68k/mm/init.c | 1 + arch/sparc/kernel/sparc_ksyms.c | 2 + arch/sparc64/mm/init.c | 1 + fs/ext4/balloc.c | 43 ++++-- fs/ext4/dir.c | 2 +- fs/ext4/ext4_jbd2.c | 12 +- fs/ext4/extents.c | 308 ++++++++++++++++++++++++++++++--------- fs/ext4/file.c | 21 +++- fs/ext4/fsync.c | 3 + fs/ext4/ialloc.c | 122 ++++++++++++++-- fs/ext4/inode.c | 52 ++++--- fs/ext4/ioctl.c | 12 +- fs/ext4/mballoc.c | 83 +++++------ fs/ext4/migrate.c | 39 +++++- fs/ext4/namei.c | 37 +++-- fs/ext4/resize.c | 76 +++++----- fs/ext4/super.c | 79 +++++++++-- fs/ext4/xattr.c | 32 ++-- fs/ext4/xattr.h | 7 - fs/jbd2/commit.c | 19 +-- fs/jbd2/journal.c | 51 ++++--- fs/jbd2/revoke.c | 163 +++++++++------------ fs/jbd2/transaction.c | 41 +++++- include/linux/ext4_fs.h | 32 ++++- include/linux/ext4_fs_sb.h | 3 + 26 files changed, 824 insertions(+), 418 deletions(-) ## # git /pub/scm/linux/kernel/git/jack/linux-udf-2.6.git for_next udf ## Auto-merged include/linux/Kbuild Removed include/linux/udf_fs.h Removed include/linux/udf_fs_sb.h Merge made by recursive. fs/udf/balloc.c | 13 +- fs/udf/crc.c | 4 +- fs/udf/dir.c | 83 ++---- fs/udf/ecma_167.h | 13 - fs/udf/file.c | 47 --- fs/udf/ialloc.c | 13 +- fs/udf/inode.c | 187 +++--------- fs/udf/lowlevel.c | 1 - fs/udf/misc.c | 1 - fs/udf/namei.c | 197 +++++--------- fs/udf/partition.c | 1 - fs/udf/super.c | 697 +++++++++++++++++++-------------------------- fs/udf/symlink.c | 1 - fs/udf/truncate.c | 81 ++---- fs/udf/udf_i.h | 30 ++- fs/udf/udf_sb.h | 93 ++++++ fs/udf/udfdecl.h | 64 +++-- fs/udf/udfend.h | 22 -- fs/udf/udftime.c | 35 ++-- fs/udf/unicode.c | 59 ++--- include/linux/Kbuild | 2 +- include/linux/udf_fs.h | 51 ---- include/linux/udf_fs_i.h | 31 -- include/linux/udf_fs_sb.h | 117 -------- 24 files changed, 682 insertions(+), 1161 deletions(-) delete mode 100644 include/linux/udf_fs.h delete mode 100644 include/linux/udf_fs_sb.h ## # git /pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next powerpc-4xx ## Merge made by recursive. Documentation/powerpc/booting-without-of.txt | 16 - arch/powerpc/Kconfig | 3 + arch/powerpc/boot/Makefile | 3 +- arch/powerpc/boot/bamboo.c | 3 +- arch/powerpc/boot/cuboot-rainier.c | 3 +- arch/powerpc/boot/cuboot-sequoia.c | 3 +- arch/powerpc/boot/cuboot-taishan.c | 3 +- arch/powerpc/boot/cuboot-warp.c | 2 +- arch/powerpc/boot/cuboot-yosemite.c | 44 ++ arch/powerpc/boot/dts/bamboo.dts | 2 - arch/powerpc/boot/dts/canyonlands.dts | 391 ++++++++++++++ arch/powerpc/boot/dts/ebony.dts | 2 - arch/powerpc/boot/dts/glacier.dts | 464 +++++++++++++++++ arch/powerpc/boot/dts/haleakala.dts | 2 +- arch/powerpc/boot/dts/rainier.dts | 2 - arch/powerpc/boot/dts/sequoia.dts | 2 - arch/powerpc/boot/dts/taishan.dts | 27 +- arch/powerpc/boot/dts/walnut.dts | 1 - arch/powerpc/boot/dts/warp.dts | 1 - arch/powerpc/boot/dts/yosemite.dts | 304 +++++++++++ arch/powerpc/boot/ebony.c | 3 +- arch/powerpc/boot/treeboot-walnut.c | 2 +- arch/powerpc/configs/canyonlands_defconfig | 721 ++++++++++++++++++++++++++ arch/powerpc/kernel/cpu_setup_44x.S | 5 +- arch/powerpc/kernel/cputable.c | 28 +- arch/powerpc/platforms/44x/Kconfig | 28 + arch/powerpc/platforms/44x/Makefile | 2 + arch/powerpc/platforms/44x/canyonlands.c | 64 +++ arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/ppc4xx_pci.c | 127 +++++- arch/powerpc/sysdev/ppc4xx_pci.h | 59 +++ arch/powerpc/sysdev/ppc4xx_soc.c | 189 +++++++ drivers/char/xilinx_hwicap/buffer_icap.c | 22 +- drivers/char/xilinx_hwicap/buffer_icap.h | 5 +- drivers/char/xilinx_hwicap/fifo_icap.c | 31 +- drivers/char/xilinx_hwicap/fifo_icap.h | 1 + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 63 ++- drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 + include/asm-powerpc/dcr-native.h | 17 + include/asm-powerpc/dcr-regs.h | 78 +++ 40 files changed, 2643 insertions(+), 105 deletions(-) create mode 100644 arch/powerpc/boot/cuboot-yosemite.c create mode 100644 arch/powerpc/boot/dts/canyonlands.dts create mode 100644 arch/powerpc/boot/dts/glacier.dts create mode 100644 arch/powerpc/boot/dts/yosemite.dts create mode 100644 arch/powerpc/configs/canyonlands_defconfig create mode 100644 arch/powerpc/platforms/44x/canyonlands.c create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c ## # git /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git master scsi-postmerge ## Auto-merged drivers/scsi/scsi_sysfs.c Merge made by recursive. drivers/misc/enclosure.c | 100 ++++++++++++++++++++++++++++++++------------- drivers/scsi/hosts.c | 12 +++++- drivers/scsi/scsi_proc.c | 7 +++- drivers/scsi/scsi_scan.c | 12 +++++- drivers/scsi/scsi_sysfs.c | 29 +++++++++++-- drivers/scsi/st.c | 18 ++++---- 6 files changed, 130 insertions(+), 48 deletions(-) ## # check ## Differences exist, continuing ## # label ## Created commit 5dad5ee: 2.6.25-rc7-mc3 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ##