Checking out files: 0% (35/3601) Checking out files: 1% (37/3601) Checking out files: 2% (73/3601) Checking out files: 3% (109/3601) Checking out files: 4% (145/3601) Checking out files: 5% (181/3601) Checking out files: 6% (217/3601) CheRemoving patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git master scsi-misc ## Removed drivers/scsi/scsi_debug.h Merge made by recursive. Documentation/scsi/st.txt | 12 +- arch/ia64/hp/sim/simscsi.c | 23 +- drivers/ata/libata-scsi.c | 6 +- drivers/base/transport_class.c | 3 +- drivers/message/fusion/mptbase.c | 29 +- drivers/message/fusion/mptbase.h | 5 +- drivers/message/fusion/mptsas.c | 22 +- drivers/message/fusion/mptscsih.c | 8 +- drivers/s390/scsi/zfcp_aux.c | 33 +- drivers/s390/scsi/zfcp_ccw.c | 21 +- drivers/s390/scsi/zfcp_dbf.c | 1283 ++++++++++++++++++----------- drivers/s390/scsi/zfcp_dbf.h | 229 +++++ drivers/s390/scsi/zfcp_def.h | 169 +---- drivers/s390/scsi/zfcp_erp.c | 680 +++++----------- drivers/s390/scsi/zfcp_ext.h | 57 +- drivers/s390/scsi/zfcp_fsf.c | 410 +++------- drivers/s390/scsi/zfcp_qdio.c | 6 +- drivers/s390/scsi/zfcp_scsi.c | 68 +- drivers/s390/scsi/zfcp_sysfs_adapter.c | 10 +- drivers/s390/scsi/zfcp_sysfs_port.c | 9 +- drivers/s390/scsi/zfcp_sysfs_unit.c | 5 +- drivers/scsi/3w-9xxx.c | 23 +- drivers/scsi/3w-xxxx.c | 14 +- drivers/scsi/BusLogic.c | 5 +- drivers/scsi/BusLogic.h | 21 +- drivers/scsi/FlashPoint.c | 6 +- drivers/scsi/Kconfig | 14 +- drivers/scsi/a2091.c | 3 + drivers/scsi/a3000.c | 3 + drivers/scsi/aacraid/aachba.c | 67 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +- drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 2 +- drivers/scsi/aic94xx/aic94xx.h | 16 - drivers/scsi/aic94xx/aic94xx_dev.c | 8 +- drivers/scsi/aic94xx/aic94xx_dump.c | 10 +- drivers/scsi/aic94xx/aic94xx_dump.h | 9 - drivers/scsi/aic94xx/aic94xx_hwi.c | 44 +- drivers/scsi/aic94xx/aic94xx_hwi.h | 2 - drivers/scsi/aic94xx/aic94xx_init.c | 10 +- drivers/scsi/aic94xx/aic94xx_reg.c | 53 +- drivers/scsi/aic94xx/aic94xx_scb.c | 33 +- drivers/scsi/aic94xx/aic94xx_sds.c | 4 +- drivers/scsi/aic94xx/aic94xx_seq.c | 31 +- drivers/scsi/aic94xx/aic94xx_seq.h | 4 - drivers/scsi/aic94xx/aic94xx_task.c | 12 +- drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- drivers/scsi/arm/acornscsi.c | 1 - drivers/scsi/arm/cumana_1.c | 1 - drivers/scsi/ch.c | 33 +- drivers/scsi/dc395x.c | 1 - drivers/scsi/eata_pio.c | 2 - drivers/scsi/gdth.c | 320 +++----- drivers/scsi/gdth.h | 2 - drivers/scsi/gvp11.c | 3 + drivers/scsi/hosts.c | 1 - drivers/scsi/hptiop.c | 7 +- drivers/scsi/initio.c | 9 +- drivers/scsi/ips.c | 89 +-- drivers/scsi/libsas/sas_scsi_host.c | 41 + drivers/scsi/lpfc/lpfc.h | 5 +- drivers/scsi/lpfc/lpfc_attr.c | 10 +- drivers/scsi/lpfc/lpfc_ct.c | 48 +- drivers/scsi/lpfc/lpfc_debugfs.c | 2 + drivers/scsi/lpfc/lpfc_els.c | 121 ++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 73 +-- drivers/scsi/lpfc/lpfc_init.c | 98 +-- drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +- drivers/scsi/lpfc/lpfc_scsi.c | 34 +- drivers/scsi/lpfc/lpfc_sli.c | 112 ++- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 3 +- drivers/scsi/mac_scsi.c | 1 - drivers/scsi/megaraid/megaraid_sas.c | 49 +- drivers/scsi/megaraid/megaraid_sas.h | 5 + drivers/scsi/mvme147.c | 3 + drivers/scsi/ps3rom.c | 101 +-- drivers/Switched to branch "ide" Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc9-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. Finished one revert. Finished one revert. Switched to branch "2.6.25-rc9-mc3" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:19: space before tab in indent. unsigned authenticated:1; warning: 1 line adds whitespace errors. .dotest/patch:14: space before tab in indent. /* .dotest/patch:15: space before tab in indent. * If device is WUSB, we already assigned an .dotest/patch:16: space before tab in indent. * unauthorized address in the Connect Ack sequence; .dotest/patch:17: space before tab in indent. * authorization will assign the final address. .dotest/patch:18: space before tab in indent. */ warning: squelched 2 whitespace errors warning: 7 lines add 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. .dotest/patch:345: space before tab in indent. mct_u232_set_modem_ctrl(serial, priv->control_state); warning: 1 line adds whitespace errors. Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" Switched to branch "gregkh-ldp" .dotest/patch:997: space before tab in indent. return result; .dotest/patch:4833: space before tab in indent. const struct firmware *fw; .dotest/patch:5193: space before tab in indent. const struct firmware *fw; .dotest/patch:7376: space before tab in indent. "Dropping\n", untd_hdr->reserved1); .dotest/patch:8672: space before tab in indent. /* warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. .dotest/patch:58: trailing whitespace. obj-$(CONFIG_SLICOSS) += slicoss.o .dotest/patch:24450: space before tab in indent. ushort DramRomFn; // 14 Dram/Rom function warning: 2 lines add whitespace errors. Switched to branch "2.6.25-rc9-mc3" error: branch 'agp' not found. fatal: Not a valid object name: '2.6.25-rc9'. Switched to branch "i2c" Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/roland/infiniband + 0ba5c67...e49d217 for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" Automatic merge failed; fix conflicts and then commit the result. www.linux-mips.org[0: 84.159.97.207]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips' not found. www.linux-mips.org[0: 84.159.97.207]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips-devel' not found. warning: too many files, skipping inexact rename detection remote: Counting objects: 237, done. remote: Compressing objects: 1% (1/77) remote: Compressing objects: 2% (2/77) remote: Compressing objects: 3% (3/77) remote: Compressing objects :remote: 5% (4/77) remote: Compressing objects: 6% (5/77) remote: Compressing objects: 7% (6/77) remote: Compressing objects: 9% (7/77) remote: Compressing objects: 10% (8/77) remote: Compressing objects :remote: 11% (9/77) remote: Compressing objects: 12% (10/77) remote: Compressing objects: 14% (11/77) remote: Compressing objects: 15% (12/77) remote: Compressing objects: 16% (13/77) remote: Compressing objects: 18% (14/77) remote: Compressing objects: 19% (15/77) remote: Compressing objects: 20% (16/77) remote: Compressing objects: 22% (17/77) remote: Compressing objects: 23% (18/77) remote: Compressing objects: 24% (19/77) remote: Compressing objects: 25% (20/77) remote: Compressing objects: 27% (21/77) remote: Compressing objects: 28% (22/77) remote: Compressing objects: 29% (23/77) remote: Compressing objects: 31% (24/77) remote: Compressing objects: 32% (25/77) remote: Compressing objects: 33% (26/77) remote: Compressing objects: 35% (27/77) remote: Compressing objects: 36% (28/77) remote: Compressing objects: 37% (29/77) remote: Compressing objects: 38% (30/77) remote: Compressing objects: 40% (31/77) remote: Compressing objects: 41% (32/77) remote: Compressing objects: 42% (33/77) remote: Compressing objects: 44% (34/77) remote: Compressing objects: 45% (35/77) remote: Compressing objects: 46% (36/77) remote: Compressing objects: 48% (37/77) remote: Compressing objects: 49% (38/77) remote: Compressing objects: 50% (39/77) remote: Compressing objects: 51% (40/77) remote: Compressing objects: 53% (41/77) remote: Compressing objects: 54% (42/77) remote: Compressing objects: 55% (43/77) remote: Compressing objects: 57% (44/77) remote: Compressing objects: 58% (45/77) remote: Compressing objects: 59% (46/77) remote: Compressing objects: 61% (47/77) remote: Compressing objects: 62% (48/77) remote: Compressing objects: 63% (49/77) remote: Compressing objects: 64% (50/77) remote: Compressing objects: 66% (51/77) remote: Compressing objects: 67% (52/77) remote: Compressing objects: 68% (53/77) remote: Compressing objects: 70% (54/77) remote: Compressing objects: 71% (55/77) remote: Compressing objects: 72% (56/77) remote: Compressing objects: 74% (57/77) remote: Compressing objects: 75% (58/77) remote: Compressing objects: 76% (59/77) remote: Compressing objects: 77% (60/77) remote: Compressing objects: 79% (61/77) remote: Compressing objects: 80% (62/77) remote: Compressing objects: 81% (63/77) remote: Compressing objects: 83% (64/77) remote: Compressing objects: 84% (65/77) remote: Compressing objects: 85% (66/77) remote: Compressing objects: 87% (67/77) remote: Compressing objects: 88% (68/77) remote: Compressing objects: 89% (69/77) remote: Compressing objects: 90% (70/77) remote: Compressing objects: 92% (71/77) remote: Compressing objects: 93% (72/77) remote: Compressing objects: 94% (73/77) remote: Compressing objects: 96% (74/77) remote: Compressing objects: 97% (75/77) remote: Compressing objects: 98% (76/77) remote: Compressing objects: 100% (77/77) remote: Compressing objects: 100% (77/77), done. remote: Total 181 (delta 150), reused 127 (delta 104) Receiving objects: 0% (1/181) Receiving objects: 1% (2/181) Receiving objects: 2% (4/181) Receiving objects: 3% (6/181) Receiving objects: 4% (8/181) Receiving objects: 5% (10/181) Receiving objects: 6% (11/181) Receiving objects: 7% (13/181) Receiving objects: 8% (15/181) Receiving objects: 9% (17/181) Receiving objects: 10% (19/181) Receiving objects: 11% (20/181) Receiving objects: 12% (22/181) Receiving objects: 13% (24/181) Receiving objects: 14% (26/181) Receiving objects: 15% (28/181) Receiving objects: 16% (29/181) Receiving objects: 17% (31/181) Receiving objects: 18% (33/181) Receiving objects: 19% (35/181) Receiving objects: 20% (37/181) Receiving objects: 21% (39/181) Receiving objects: 22% (40/181) Receiving objects: 23% (42/181) Receiving objects: 24% (44/181) Receiving objects: 25% (46/181) Receiving objects: 26% (48/181) Receiving objects: 27% (49/181) Receiving objects: 28% (51/181) Receiving objects: 29% (53/181) Receiving objects: 30% (55/181) Receiving objects: 31% (57/181) Receiving objects: 32% (58/181) Receiving objects: 33% (60/181) Receiving objects: 34% (62/181) Receiving objects: 35% (64/181) Receiving objects: 36% (66/181) Receiving objects: 37% (67/181) Receiving objects: 38% (69/181) Receiving objects: 39% (71/181) Receiving objects: 40% (73/181) Receiving objects: 41% (75/181) Receiving objects: 42% (77/181) Receiving objects: 43% (78/181) Receiving objects: 44% (80/181) Receiving objects: 45% (82/181) Receiving objects: 46% (84/181) Receiving objects: 47% (86/181) Receiving objects: 48% (87/181) Receiving objects: 49% (89/181) Receiving objects: 50% (91/181) Receiving objects: 51% (93/181) Receiving objects: 52% (95/181) Receiving objects: 53% (96/181) Receiving objects: 54% (98/181) Receiving objects: 55% (100/181) Receiving objects: 56% (102/181) Receiving objects: 57% (104/181) Receiving objects: 58% (105/181) Receiving objects: 59% (107/181) Receiving objects: 60% (109/181) Receiving objects: 61% (111/181) Receiving objects: 62% (113/181) Receiving objects: 63% (115/181) Receiving objects: 64% (116/181) Receiving objects: 65% (118/181) Receiving objects: 66% (120/181) Receiving objects: 67% (122/181) Receiving objects: 68% (124/181) Receiving objects: 69% (125/181) Receiving objects: 70% (127/181) Receiving objects: 71% (129/181) Receiving objects: 72% (131/181) Receiving objects: 73% (133/181) Receiving objects: 74% (134/181) Receiving objects: 75% (136/181) Receiving objects: 76% (138/181) Receiving objects: 77% (140/181) Receiving objects: 78% (142/181) Receiving objects: 79% (143/181) Receiving objects: 80% (145/181) Receiving objects: 81% (147/181) Receiving objects: 82% (149/181) Receiving objects: 83% (151/181) Receiving objects: 84% (153/181) Receiving objects: 85% (154/181) Receiving objects: 86% (156/181) Receiving objects: 87% (158/181) Receiving objects: 88% (160/181) Receiving objects: 89% (162/181) Receiving objects: 90% (163/181) Receiving objects: 91% (165/181) Receiving objects: 92% (167/181) Receiving objects: 93% (169/181) Receiving objects: 94% (171/181) Receiving objects: 95% (172/181) Receiving objects: 96% (174/181) Receiving objects: 97% (176/181) Receiving objects: 98% (178/181) Receiving objects: 99% (180/181) Receiving objects: 100% (181/181) Receiving objects: 100% (181/181), 52.94 KiB, done. Resolving deltas: 4% (7/150) Resolving deltas: 6% (9/150) Resolving deltas: 7% (11/150) Resolving deltas: 10% (16/150) Resolving deltas: 11% (17/150) Resolving deltas: 12% (18/150) Resolving deltas: 16% (24/150) Resolving deltas: 18% (27/150) Resolving deltas: 19% (29/150) Resolving deltas: 20% (30/150) Resolving deltas: 30% (46/150) Resolving deltas: 34% (52/150) Resolving deltas: 35% (53/150) Resolving deltas: 36% (54/150) Resolving deltas: 38% (57/150) Resolving deltas: 40% (60/150) Resolving deltas: 42% (63/150) Resolving deltas: 44% (66/150) Resolving deltas: 45% (68/150) Resolving deltas: 46% (69/150) Resolving deltas: 47% (71/150) Resolving deltas: 48% (72/150) Resolving deltas: 50% (76/150) Resolving deltas: 51% (77/150) Resolving deltas: 52% (78/150) Resolving deltas: 54% (81/150) Resolving deltas: 56% (84/150) Resolving deltas: 57% (86/150) Resolving deltas: 58% (87/150) Resolving deltas: 59% (89/150) Resolving deltas: 60% (90/150) Resolving deltas: 62% (93/150) Resolving deltas: 63% (95/150) Resolving deltas: 64% (97/150) Resolving deltas: 65% (98/150) Resolving deltas: 66% (99/150) Resolving deltas: 67% (101/150) Resolving deltas: 68% (102/150) Resolving deltas: 69% (104/150) Resolving deltas: 80% (121/150) Resolving deltas: 84% (127/150) Resolving deltas: 85% (128/150) Resolving deltas: 89% (134/150) Resolving deltas: 100% (150/150) Resolving deltas: 100% (150/150), completed with 55 local objects. From /pub/scm/linux/kernel/git/davem/net-2.6.26 c0b8c32..6fb9114 master -> net Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + a2d62a7...e81f0f6 master -> x86 (forced update) Switched to branch "x86" Finished one revert. Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. fatal: Not a valid object name: '2.6.25-rc8'. Checking out files: 26% (941/3567) Checking out files: 27% (964/3567) Checking out files: 28% (999/3567) Checking out files: 29% (1035/3567) Checking out files: 30% (1071/3567) Checking out files: 31% (1106/3567) Checking out files: 32% (1142/3567) Checking out files: 33% (1178/3567) Checking out files: 34% (1213/3567) Checking out files: 35% (1249/3567) Checking out files: 36% (1285/3567) Checking out files: 36% (1290/3567) Checking out files: 37% (1320/3567) Checking out files: 38% (1356/3567) Checking out files: 39% (1392/3567) Checking out files: 40% (1427/3567) Checking out files: 41% (1463/3567) Checking out files: 42% (1499/3567) Checking out files: 43% (1534/3567) Checking out files: 44% (1570/3567) Checking out files: 45% (1606/3567) Checking out files: 46% (1641/3567) Checking out files: 47% (1677/3567) Checking out files: 48% (1713/3567) Checking out files: 49% (1748/3567) Checking out files: 50% (1784/3567) Checking out files: 50% (1806/3567) Checking out files: 51% (1820/3567) Checking out files: 52% (1855/3567) Checking out files: 53% (1891/3567) Checking out files: 54% (1927/3567) Checking out files: 55% (1962/3567) Checking out files: 56% (1998/3567) Checking out files: 57% (2034/3567) Checking out files: 58% (2069/3567) Checking out files: 59% (2105/3567) Checking out files: 60% (2141/3567) Checking out files: 61% (2176/3567) Checking out files: 62% (2212/3567) Checking out files: 63% (2248/3567) Checking out files: 64% (2283/3567) Checking out files: 65% (2319/3567) Checking out files: 66% (2355/3567) Checking out files: 66% (2384/3567) Checking out files: 67% (2390/3567) Checking out files: 68% (2426/3567) Checking out files: 68% (2437/3567) Checking out files: 69% (2462/3567) Checking out files: 70% (2497/3567) Checking out files: 71% (2533/3567) Checking out files: 72% (2569/3567) Checking out files: 73% (2604/3567) Checking out files: 74% (2640/3567) Checking out files: 74% (2668/3567) Checking out files: 75% (2676/3567) Checking out files: 76% (2711/3567) Checking out files: 77% (2747/3567) Checking out files: 78% (2783/3567) Checking out files: 79% (2818/3567) Checking out files: 80% (2854/3567) Checking out files: 81% (2890/3567) Checking out files: 82% (2925/3567) Checking out files: 83% (2961/3567) Checking out files: 84% (2997/3567) Checking out files: 85% (3032/3567) Checking out files: 86% (3068/3567) Checking out files: 86% (3094/3567) Checking out files: 87% (3104/3567) Checking out files: 88% (3139/3567) Checking out files: 89% (3175/3567) Checking out files: 90% (3211/3567) Checking out files: 91% (3246/3567) Checking out files: 92% (3282/3567) Checking out files: 93% (3318/3567) Checking out files: 94% (3353/3567) Checking out files: 95% (3389/3567) Checking out files: 96% (3425/3567) Checking out files: 97% (3460/3567) Checking out files: 98% (3496/3567) Checking out files: 99% (3532/3567) Checking out files: 100% (3567/3567) Checking out files: 100% (3567/3567), done. Switched to branch "doc" Checking out files: 4% (166/3577) Checking out files: 5% (179/3577) Checking out files: 6% (215/3577) Checking out files: 7% (251/3577) Checking out files: 8% (287/3577) Checking out files: 9% (322/3577) Checking out files: 10% (358/3577) Checking out files: 11% (394/3577) Checking out files: 12% (430/3577) Checking out files: 13% (466/3577) Checking out files: 14% (501/3577) Checking out files: 15% (537/3577) Checking out files: 16% (573/3577) Checking out files: 17% (609/3577) Checking out files: 18% (644/3577) Checking out files: 19% (680/3577) Checking out files: 20% (716/3577) Checking out files: 21% (752/3577) Checking out files: 22% (787/3577) Checking out files: 23% (823/3577) Checking out files: 24% (859/3577) Checking out files: 25% (895/3577) Checking out files: 26% (931/3577) Checking out files: 27% (966/3577) Checking out files: 28% (1002/3577) Checking out files: 29% (1038/3577) Checking out files: 30% (1074/3577) Checking out files: 31% (1109/3577) Checking out files: 32% (1145/3577) Checking out files: 33% (1181/3577) Checking out files: 34% (1217/3577) Checking out files: 35% (1252/3577) Checking out files: 36% (1288/3577) Checking out files: 37% (1324/3577) Checking out files: 38% (1360/3577) Checking out files: 39% (1396/3577) Checking out files: 40% (1431/3577) Checking out files: 41% (1467/3577) Checking out files: 42% (1503/3577) Checking out files: 43% (1539/3577) Checking out files: 44% (1574/3577) Checking out files: 45% (1610/3577) Checking out files: 46% (1646/3577) Checking out files: 47% (1682/3577) Checking out files: 48% (1717/3577) Checking out files: 49% (1753/3577) Checking out files: 50% (1789/3577) Checking out files: 51% (1825/3577) Checking out files: 52% (1861/3577) Checking out files: 53% (1896/3577) Checking out files: 54% (1932/3577) Checking out files: 55% (1968/3577) Checking out files: 56% (2004/3577) Checking out files: 57% (2039/3577) Checking out files: 57% (2042/3577) Checking out files: 58% (2075/3577) Checking out files: 59% (2111/3577) Checking out files: 60% (2147/3577) Checking out files: 61% (2182/3577) Checking out files: 62% (2218/3577) Checking out files: 63% (2254/3577) Checking out files: 64% (2290/3577) Checking out files: 65% (2326/3577) Checking out files: 66% (2361/3577) Checking out files: 67% (2397/3577) Checking out files: 68% (2433/3577) Checking out files: 69% (2469/3577) Checking out files: 70% (2504/3577) Checking out files: 71% (2540/3577) Checking out files: 72% (2576/3577) Checking out files: 73% (2612/3577) Checking out files: 74% (2647/3577) Checking out files: 75% (2683/3577) Checking out files: 76% (2719/3577) Checking out files: 77% (2755/3577) Checking out files: 78% (2791/3577) Checking out files: 79% (2826/3577) Checking out files: 80% (2862/3577) Checking out files: 81% (2898/3577) Checking out files: 82% (2934/3577) Checking out files: 83% (2969/3577) Checking out files: 84% (3005/3577) Checking out files: 85% (3041/3577) Checking out files: 86% (3077/3577) Checking out files: 87% (3112/3577) Checking out files: 88% (3148/3577) Checking out files: 89% (3184/3577) Checking out files: 90% (3220/3577) Checking out files: 91% (3256/3577) Checking out files: 92% (3291/3577) Checking out files: 93% (3327/3577) Checking out files: 94% (3363/3577) Checking out files: 95% (3399/3577) Checking out files: 96% (3434/3577) Checking out files: 97% (3470/3577) Checking out files: 98% (3506/3577) Checking out files: 98% (3533/3577) Checking out files: 99% (3542/3577) Checking out files: 100% (3577/3577) Checking out files: 100% (3577/3577), done. Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Switched to branch "m68k" .dotest/patch:353: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:382: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:404: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use .dotest/patch:426: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use warning: 4 lines add whitespace errors. .dotest/patch:868: space before tab in indent. break; .dotest/patch:870: space before tab in indent. } while (--poll_count); .dotest/patch:875: space before tab in indent. if (!poll_count) { .dotest/patch:880: space before tab in indent. } else { .dotest/patch:1631: space before tab in indent. shouldn't this be a given if we have it here ? */ warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. Switched to branch "2.6.25-rc9-mc3" Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Already on "2.6.25-rc9-mc3" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection ape_discard_read_pipeline-ide_tape_discard_merge_buffer.patch ide-tape-mv-idetape_empty_write_pipeline-ide_tape_flush_merge_buffer.patch ide-tape-mv-tape-merge_stage_size-tape-merge_bh_size.patch ide-tape-remove-tape-merge_stage.patch ide-tape-fix-mem-leak.patch falconide-q40ide-add-atapi_-put_bytes-and-ata_-put_data-methods-take-2.patch ide-merge-atapi_-put_bytes-and-ata_-put_data-methods.patch scc_pata-add-in-out-put_data-methods.patch au1xxx-ide-add-in-out-put_data-methods.patch ide-h8300-add-in-out-put_data-methods.patch ide-add-ide_hflag_mmio-host-flag-take-2.patch ide-remove-inswl-and-outswl-methods.patch siimage-do-clocking-register-posting-earlier-in-setup_mmio_siimage.patch siimage-add-sil_-io-ops.patch siimage-remove-proc_reports_siimage.patch ide-always-use-outbsync-method-for-executing-commands.patch ide-floppy-tape-scsi-400ns-delay-is-required-after-executing-the-command.patch ## # merge ide ## Auto-merged Documentation/kernel-parameters.txt Removed include/linux/hdsmart.h Merge made by recursive. Documentation/ide/ide-tape.txt | 211 ++--- Documentation/ide/ide.txt | 146 +-- Documentation/ide/warm-plug-howto.txt | 13 + Documentation/kernel-parameters.txt | 9 +- Documentation/mips/AU1xxx_IDE.README | 46 - arch/powerpc/kernel/setup_32.c | 8 - arch/powerpc/platforms/powermac/pci.c | 22 - arch/powerpc/platforms/powermac/pmac.h | 5 - arch/powerpc/platforms/powermac/setup.c | 8 - arch/ppc/configs/sandpoint_defconfig | 2 +- arch/ppc/kernel/ppc_ksyms.c | 5 - arch/ppc/kernel/setup.c | 2 - arch/ppc/platforms/4xx/bamboo.c | 1 - arch/ppc/platforms/4xx/ebony.c | 1 - arch/ppc/platforms/4xx/luan.c | 1 - arch/ppc/platforms/4xx/ocotea.c | 1 - arch/ppc/platforms/4xx/taishan.c | 1 - arch/ppc/platforms/4xx/yucca.c | 1 - arch/ppc/platforms/chestnut.c | 1 - arch/ppc/platforms/cpci690.c | 1 - arch/ppc/platforms/ev64260.c | 1 - arch/ppc/platforms/hdpu.c | 36 - arch/ppc/platforms/lopec.c | 85 -- arch/ppc/platforms/mvme5100.c | 1 - arch/ppc/platforms/powerpmc250.c | 1 - arch/ppc/platforms/pplus.c | 58 - arch/ppc/platforms/prep_setup.c | 38 - arch/ppc/platforms/prpmc750.c | 1 - arch/ppc/platforms/prpmc800.c | 1 - arch/ppc/platforms/radstone_ppc7d.c | 1 - arch/ppc/platforms/residual.c | 1 - arch/ppc/platforms/sandpoint.c | 94 -- arch/ppc/platforms/sandpoint.h | 3 - arch/ppc/platforms/spruce.c | 1 - arch/ppc/syslib/m8xx_setup.c | 6 - arch/ppc/syslib/ppc4xx_setup.c | 23 - block/compat_ioctl.c | 1 - drivers/ide/Kconfig | 44 +- drivers/ide/Makefile | 2 +- drivers/ide/arm/bast-ide.c | 24 +- drivers/ide/arm/icside.c | 68 +- drivers/ide/arm/ide_arm.c | 20 +- drivers/ide/arm/palm_bk3710.c | 64 +- drivers/ide/arm/rapide.c | 12 +- drivers/ide/cris/ide-cris.c | 115 +- drivers/ide/h8300/ide-h8300.c | 28 +- drivers/ide/ide-acpi.c | 32 +- drivers/ide/ide-cd.c | 937 +++++++--------- drivers/ide/ide-cd.h | 4 - drivers/ide/ide-disk.c | 159 ++-- drivers/ide/ide-dma.c | 155 +--- drivers/ide/ide-floppy.c | 386 +++---- drivers/ide/ide-generic.c | 119 ++- drivers/ide/ide-io.c | 56 +- drivers/ide/ide-iops.c | 262 ++--- drivers/ide/ide-lib.c | 44 +- drivers/ide/ide-pnp.c | 46 +- drivers/ide/ide-probe.c | 401 ++++++-- drivers/ide/ide-proc.c | 188 ++-- drivers/ide/ide-scan-pci.c | 11 +- drivers/ide/ide-tape.c | 1681 ++++++++--------------------- drivers/ide/ide-taskfile.c | 63 +- drivers/ide/ide.c | 1164 +++++---------------- drivers/ide/legacy/Makefile | 1 + drivers/ide/legacy/ali14xx.c | 32 +- drivers/ide/legacy/buddha.c | 19 +- drivers/ide/legacy/dtc2278.c | 27 +- drivers/ide/legacy/falconide.c | 41 +- drivers/ide/legacy/gayle.c | 26 +- drivers/ide/legacy/hd.c | 78 +- drivers/ide/legacy/ht6560b.c | 54 +- drivers/ide/legacy/ide-4drives.c | 72 ++ drivers/ide/legacy/ide-cs.c | 83 +- drivers/ide/legacy/ide_platform.c | 14 +- drivers/ide/legacy/macide.c | 9 +- drivers/ide/legacy/q40ide.c | 34 +- drivers/ide/legacy/qd65xx.c | 223 ++--- drivers/ide/legacy/qd65xx.h | 1 - drivers/ide/legacy/umc8672.c | 80 +- drivers/ide/mips/au1xxx-ide.c | 146 +-- drivers/ide/mips/swarm.c | 20 +- drivers/ide/pci/aec62xx.c | 39 +- drivers/ide/pci/alim15x3.c | 332 +----- drivers/ide/pci/amd74xx.c | 19 +- drivers/ide/pci/atiixp.c | 29 +- drivers/ide/pci/cmd640.c | 316 +++--- drivers/ide/pci/cmd64x.c | 153 ++-- drivers/ide/pci/cs5520.c | 29 +- drivers/ide/pci/cs5530.c | 18 +- drivers/ide/pci/cs5535.c | 24 +- drivers/ide/pci/cy82c693.c | 97 +- drivers/ide/pci/delkin_cb.c | 19 +- drivers/ide/pci/generic.c | 10 +- drivers/ide/pci/hpt34x.c | 17 +- drivers/ide/pci/hpt366.c | 191 ++-- drivers/ide/pci/it8213.c | 34 +- drivers/ide/pci/it821x.c | 52 +- drivers/ide/pci/jmicron.c | 29 +- drivers/ide/pci/ns87415.c | 44 +- drivers/ide/pci/opti621.c | 82 +- drivers/ide/pci/pdc202xx_new.c | 23 +- drivers/ide/pci/pdc202xx_old.c | 126 +-- drivers/ide/pci/piix.c | 17 +- drivers/ide/pci/rz1000.c | 2 +- drivers/ide/pci/sc1200.c | 39 +- drivers/ide/pci/scc_pata.c | 138 ++- drivers/ide/pci/serverworks.c | 38 +- drivers/ide/pci/sgiioc4.c | 153 ++-- drivers/ide/pci/siimage.c | 508 ++++----- drivers/ide/pci/sis5513.c | 253 +++--- drivers/ide/pci/sl82c105.c | 87 +- drivers/ide/pci/slc90e66.c | 22 +- drivers/ide/pci/tc86c001.c | 90 +- drivers/ide/pci/triflex.c | 12 +- drivers/ide/pci/trm290.c | 47 +- drivers/ide/pci/via82cxxx.c | 20 +- drivers/ide/ppc/mpc8xx.c | 142 ++-- drivers/ide/ppc/pmac.c | 282 +++--- drivers/ide/setup-pci.c | 227 ++--- drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 232 ++--- include/asm-alpha/ide.h | 11 - include/asm-arm/arch-sa1100/ide.h | 6 +- include/asm-arm/ide.h | 8 - include/asm-blackfin/ide.h | 4 - include/asm-cris/arch-v10/ide.h | 11 +- include/asm-ia64/ide.h | 10 - include/asm-m32r/ide.h | 10 - include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 - include/asm-mips/mach-generic/ide.h | 10 - include/asm-parisc/ide.h | 2 - include/asm-powerpc/ide.h | 57 +- include/asm-powerpc/mediabay.h | 6 +- include/asm-sh/ide.h | 3 - include/asm-sparc/ide.h | 2 - include/asm-sparc64/ide.h | 2 - include/asm-x86/ide.h | 10 - include/linux/Kbuild | 1 - include/linux/hdreg.h | 4 +- include/linux/hdsmart.h | 126 --- include/linux/ide.h | 412 ++++---- 141 files changed, 4983 insertions(+), 7645 deletions(-) create mode 100644 Documentation/ide/warm-plug-howto.txt create mode 100644 drivers/ide/legacy/ide-4drives.c delete mode 100644 include/linux/hdsmart.h ## # gitfetch /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 gregkh-driver scsi-driverbase ## ## # gitfetch /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 gregkh-driver-base scsi-driverbase-base ## ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/. gregkh-driver ## building file list ... done ./ README block-send-disk-change-event-for-rescan_partitions.patch driver-core-call-device_pm_add-after-bus_add_device-in-device_add.patch driver-core-convert-debug-functions-declared-inline-__attribute__-to-statement-expression-macros.patch driver-core-cpu-fix-section-mismatch-in-cpu.c-store_online.patch driver-core-make-device_is_registered-work-for-class-devices.patch driver-core-memory-semaphore-to-mutex.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch driver-core-replace-remaining-__function__-occurrences.patch drm-remove-unused-dev_class.patch firmware-add-iscsi-ibft-support.patch firmware-clean-up-samples-for-coding-style-issues.patch firmware-move-firmware_class-from-documentation-to-samples.patch ib-convert-struct-class_device-to-struct-device.patch ib-rename-dev-to-srp_dev-in-srp_host-structure.patch kobject-catch-kobjects-that-are-not-initialized.patch kobject-replace-list_for_each-with-list_for_each_entry.patch memstick-convert-struct-class_device-to-struct-device.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch pm-convert-wakeup-flag-accessors-to-inline-functions.patch pm-fix-misuse-of-wakeup-flag-accessors-in-serial-core.patch pm-handle-device-registrations-during-suspend-resume.patch pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch pm-remove-destroy_suspended_device.patch pm-remove-legacy-pm.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch put_device-might_sleep.patch scsi-convert-struct-class_device-to-struct-device.patch series sysdev-detect-multiple-driver-registrations.patch sysfs-crash-debugging.patch sysfs-explicitly-include-required-header-file-slab.h.patch sysfs-refill-attribute-buffer-when-reading-from-offset-0.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-hold-a-reference-to-the-device-s-owner-while-the-device-is-open.patch uio-implement-a-uio-interface-for-the-smx-cryptengine.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch warn-when-statically-allocated-kobjects-are-used.patch sent 530765 bytes received 950 bytes 1063430.00 bytes/sec total size is 525429 speedup is 0.99 2.6.25-rc8-git9 to d10d89ec78114f925f63c5126a2b2490f501a462 Using base d10d89ec78114f925f63c5126a2b2490f501a462 kobject-catch-kobjects-that-are-not-initialized.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch uio-implement-a-uio-interface-for-the-smx-cryptengine.patch uio-hold-a-reference-to-the-device-s-owner-while-the-device-is-open.patch driver-core-memory-semaphore-to-mutex.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch driver-core-convert-debug-functions-declared-inline-__attribute__-to-statement-expression-macros.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch firmware-move-firmware_class-from-documentation-to-samples.patch firmware-clean-up-samples-for-coding-style-issues.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch driver-core-cpu-fix-section-mismatch-in-cpu.c-store_online.patch sysdev-detect-multiple-driver-registrations.patch block-send-disk-change-event-for-rescan_partitions.patch pm-handle-device-registrations-during-suspend-resume.patch driver-core-call-device_pm_add-after-bus_add_device-in-device_add.patch pm-fix-misuse-of-wakeup-flag-accessors-in-serial-core.patch pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch pm-convert-wakeup-flag-accessors-to-inline-functions.patch driver-core-make-device_is_registered-work-for-class-devices.patch sysfs-explicitly-include-required-header-file-slab.h.patch kobject-replace-list_for_each-with-list_for_each_entry.patch pm-remove-legacy-pm.patch firmware-add-iscsi-ibft-support.patch pm-remove-destroy_suspended_device.patch sysfs-refill-attribute-buffer-when-reading-from-offset-0.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch driver-core-replace-remaining-__function__-occurrences.patch memstick-convert-struct-class_device-to-struct-device.patch ib-convert-struct-class_device-to-struct-device.patch ib-rename-dev-to-srp_dev-in-srp_host-structure.patch drm-remove-unused-dev_class.patch scsi-convert-struct-class_device-to-struct-device.patch put_device-might_sleep.patch warn-when-statically-allocated-kobjects-are-used.patch ## # quiltstable gregkh-driver scsi-driverbase scsi-driverbase-base ## Created commit 1949562: Revert "warn when statically-allocated kobjects are used" 3 files changed, 0 insertions(+), 62 deletions(-) Created commit 3faa636: Revert "Make put_device() warn that it will sleep" 1 files changed, 0 insertions(+), 1 deletions(-) Created commit 2bf334d: Revert "SCSI: convert struct class_device to struct device" 55 files changed, 1505 insertions(+), 1755 deletions(-) Created commit 0ac708c: Revert "DRM: remove unused dev_class" 1 files changed, 1 insertions(+), 0 deletions(-) Created commit 387b2aa: Revert "IB: rename "dev" to "srp_dev" in srp_host structure" 2 files changed, 24 insertions(+), 27 deletions(-) Created commit 05ac7ef: Revert "IB: convert struct class_device to struct device" 15 files changed, 319 insertions(+), 352 deletions(-) Created commit abd9bc7: Revert "memstick: convert struct class_device to struct device" 4 files changed, 28 insertions(+), 27 deletions(-) Created commit 8e9517c: Revert "driver core: replace remaining __FUNCTION__ occurrences" 7 files changed, 36 insertions(+), 36 deletions(-) Created commit 32163bc: Revert "NET: convert the phy_device file to use bus_find_device_by_name" 1 files changed, 7 insertions(+), 1 deletions(-) Created commit f0ef6a2: Revert "sysfs: refill attribute buffer when reading from offset 0" 2 files changed, 5 insertions(+), 9 deletions(-) Created commit 65079d3: Revert "PM: Remove destroy_suspended_device()" 13 files changed, 146 insertions(+), 22 deletions(-) Removed Documentation/ABI/testing/sysfs-ibft Removed drivers/firmware/iscsi_ibft.c Removed drivers/firmware/iscsi_ibft_find.c Removed include/linux/iscsi_ibft.h Created commit e9378c1: Revert "Firmware: add iSCSI iBFT Support" 8 files changed, 0 insertions(+), 1168 deletions(-) delete mode 100644 Documentation/ABI/testing/sysfs-ibft delete mode 100644 drivers/firmware/iscsi_ibft.c delete mode 100644 drivers/firmware/iscsi_ibft_find.c delete mode 100644 include/linux/iscsi_ibft.h Created commit 2edd2a7: Revert "PM: Remove legacy PM (fix)" 1 files changed, 5 insertions(+), 0 deletions(-) Created commit 0a28381: Revert "Kobject: Replace list_for_each() with list_for_each_entry()." 1 files changed, 8 insertions(+), 2 deletions(-) Created commit 46f861a: Revert "SYSFS: Explicitly include required header file slab.h." 2 files changed, 0 insertions(+), 2 deletions(-) Created commit 84cdad1: Revert "Driver core: make device_is_registered() work for class devices" 2 files changed, 9 insertions(+), 3 deletions(-) Removed include/linux/pm_wakeup.h Created commit b047664: Revert "PM: Convert wakeup flag accessors to inline functions" 3 files changed, 45 insertions(+), 94 deletions(-) delete mode 100644 include/linux/pm_wakeup.h Created commit 3b54010: Revert "PM: Make wakeup flags available whenever CONFIG_PM is set" 3 files changed, 17 insertions(+), 23 deletions(-) Created commit c8224bd: Revert "PM: Fix misuse of wakeup flag accessors in serial core" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit cb09055: Revert "Driver core: Call device_pm_add() after bus_add_device() in device_add()" 2 files changed, 11 insertions(+), 8 deletions(-) Created commit eae6d61: Revert "PM: Handle device registrations during suspend/resume" 5 files changed, 52 insertions(+), 40 deletions(-) Created commit 4a2c54b: Revert "block: send disk "change" event for rescan_partitions()" 1 files changed, 0 insertions(+), 4 deletions(-) Created commit 3d77278: Revert "sysdev: detect multiple driver registrations" 1 files changed, 0 insertions(+), 16 deletions(-) Created commit ec19c59: Revert "driver core: cpu: fix section mismatch in cpu.c:store_online" 1 files changed, 2 insertions(+), 2 deletions(-) Created commit dfd023e: Revert "power_state: remove it from driver core" 1 files changed, 5 insertions(+), 0 deletions(-) Created commit ee7018e: Revert "PNP: add all PNP card device id's as individual aliases" 1 files changed, 13 insertions(+), 44 deletions(-) Created commit f8635a4: Revert "firmware: clean up samples for coding style issues" 2 files changed, 38 insertions(+), 40 deletions(-) Created commit 3d4b0dd: Revert "firmware: move firmware_class from Documentation/ to samples/" 2 files changed, 6 insertions(+), 6 deletions(-) rename {samples => Documentation}/firmware_class/firmware_sample_driver.c (99%) rename {samples => Documentation}/firmware_class/firmware_sample_firmware_class.c (99%) Created commit a53452d: Revert "sysfs: small header file cleanup for SYSFS=n" 1 files changed, 7 insertions(+), 2 deletions(-) Created commit 30baeea: Revert "driver core: Convert debug functions declared inline __attribute__((format (printf,x,y) to statement expression macros" 2 files changed, 14 insertions(+), 7 deletions(-) Created commit 4e8b6df: Revert "driver core: register_memory/unregister_memory clean ups and bugfix" 1 files changed, 15 insertions(+), 7 deletions(-) Created commit b9c6144: Revert "driver core: memory: semaphore to mutex" 3 files changed, 7 insertions(+), 7 deletions(-) Created commit 29e4d38: Revert "UIO: hold a reference to the device's owner while the device is open" 1 files changed, 15 insertions(+), 21 deletions(-) Removed drivers/uio/uio_smx.c Created commit 6ec7d74: Revert "UIO: Implement a UIO interface for the SMX Cryptengine" 4 files changed, 0 insertions(+), 159 deletions(-) delete mode 100644 drivers/uio/uio_smx.c Created commit 29cd572: Revert "UIO: Remove needless PCI_DEVICE_ID definition from uio_cif.c" 1 files changed, 4 insertions(+), 0 deletions(-) Created commit da4be03: Revert "UIO: arch/arm/Kconfig: Make UIO available on ARM architecture" 1 files changed, 0 insertions(+), 2 deletions(-) Created commit c5a54c0: Revert "uio: mark pci_device_id hilscher_pci_ids[] __devinitdata" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit f947098: Revert "uio: Kconfig improvements" 1 files changed, 5 insertions(+), 5 deletions(-) Created commit ff856c1: Revert "kobject: catch kobjects that are not initialized" 1 files changed, 1 insertions(+), 8 deletions(-) Merge made by recursive. Documentation/ABI/testing/sysfs-ibft | 23 + Documentation/DocBook/kernel-api.tmpl | 5 - Documentation/filesystems/sysfs.txt | 9 +- Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + arch/x86/kernel/cpuid.c | 4 +- arch/x86/kernel/msr.c | 4 +- arch/x86/kernel/setup_32.c | 3 + arch/x86/kernel/setup_64.c | 4 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 +- drivers/base/bus.c | 17 +- drivers/base/class.c | 8 +- drivers/base/core.c | 59 +- drivers/base/cpu.c | 4 +- drivers/base/dd.c | 14 +- drivers/base/firmware_class.c | 18 +- drivers/base/memory.c | 33 +- drivers/base/power/main.c | 106 +-- drivers/base/power/power.h | 23 +- drivers/base/power/sysfs.c | 2 + drivers/base/sys.c | 18 +- drivers/base/transport_class.c | 14 +- drivers/char/drm/drmP.h | 1 - drivers/char/hw_random/core.c | 10 +- drivers/char/misc.c | 13 +- drivers/firmware/Kconfig | 20 + drivers/firmware/Makefile | 2 + drivers/firmware/iscsi_ibft.c | 982 ++++++++++++++++++++ drivers/firmware/iscsi_ibft_find.c | 84 ++ drivers/infiniband/core/sysfs.c | 76 +- drivers/infiniband/core/ucm.c | 62 +- drivers/infiniband/core/user_mad.c | 109 ++-- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_main.c | 51 +- drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 +- drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- drivers/infiniband/hw/mlx4/main.c | 49 +- drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- drivers/infiniband/hw/nes/nes_verbs.c | 48 +- drivers/infiniband/ulp/srp/ib_srp.c | 181 ++-- drivers/infiniband/ulp/srp/ib_srp.h | 4 +- drivers/leds/led-class.c | 11 +- drivers/memstick/core/memstick.c | 33 +- drivers/memstick/core/mspro_block.c | 4 +- drivers/memstick/host/jmb38x_ms.c | 16 +- drivers/message/fusion/mptscsih.c | 122 ++-- drivers/message/fusion/mptscsih.h | 2 +- drivers/misc/enclosure.c | 118 ++-- drivers/net/phy/phy_device.c | 8 +- drivers/net/wireless/b43/leds.c | 5 +- drivers/net/wireless/b43/main.c | 8 +- drivers/scsi/3w-9xxx.c | 9 +- drivers/scsi/3w-xxxx.c | 9 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/aacraid.h | 4 +- drivers/scsi/aacraid/linit.c | 93 ++- drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 163 ++-- drivers/scsi/ch.c | 13 +- drivers/scsi/hosts.c | 34 +- drivers/scsi/hptiop.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- drivers/scsi/ipr.c | 140 ++-- drivers/scsi/lpfc/lpfc_attr.c | 484 +++++----- drivers/scsi/lpfc/lpfc_crtn.h | 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 | 36 +- 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 | 6 +- include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 35 +- include/linux/enclosure.h | 11 +- include/linux/hw_random.h | 10 +- include/linux/init.h | 1 + include/linux/iscsi_ibft.h | 50 + include/linux/kernel.h | 6 +- include/linux/leds.h | 10 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/miscdevice.h | 10 +- include/linux/pm.h | 43 +- include/linux/pm_wakeup.h | 90 ++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- 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 | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 +- 132 files changed, 3937 insertions(+), 2325 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-ibft create mode 100644 drivers/firmware/iscsi_ibft.c create mode 100644 drivers/firmware/iscsi_ibft_find.c create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/iscsi_ibft.h 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 ## Auto-merged drivers/ata/libata-scsi.c 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/ch.c Auto-merged drivers/scsi/hosts.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/lpfc/lpfc_attr.c Auto-merged drivers/scsi/qla2xxx/qla_attr.c Auto-merged drivers/scsi/qla2xxx/qla_gbl.h Auto-merged drivers/scsi/raid_class.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 Merge made by recursive. Documentation/ABI/testing/sysfs-ibft | 23 + Documentation/DocBook/kernel-api.tmpl | 5 - Documentation/filesystems/sysfs.txt | 9 +- Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + arch/x86/kernel/cpuid.c | 4 +- arch/x86/kernel/msr.c | 4 +- arch/x86/kernel/setup_32.c | 3 + arch/x86/kernel/setup_64.c | 4 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 +- drivers/base/bus.c | 17 +- drivers/base/class.c | 8 +- drivers/base/core.c | 59 +- drivers/base/cpu.c | 4 +- drivers/base/dd.c | 14 +- drivers/base/firmware_class.c | 18 +- drivers/base/memory.c | 33 +- drivers/base/power/main.c | 106 +-- drivers/base/power/power.h | 23 +- drivers/base/power/sysfs.c | 2 + drivers/base/sys.c | 18 +- drivers/base/transport_class.c | 14 +- drivers/char/drm/drmP.h | 1 - drivers/char/hw_random/core.c | 10 +- drivers/char/misc.c | 13 +- drivers/firmware/Kconfig | 20 + drivers/firmware/Makefile | 2 + drivers/firmware/iscsi_ibft.c | 982 ++++++++++++++++++++ drivers/firmware/iscsi_ibft_find.c | 84 ++ drivers/infiniband/core/sysfs.c | 76 +- drivers/infiniband/core/ucm.c | 62 +- drivers/infiniband/core/user_mad.c | 109 ++-- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_main.c | 51 +- drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 +- drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- drivers/infiniband/hw/mlx4/main.c | 49 +- drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- drivers/infiniband/hw/nes/nes_verbs.c | 48 +- drivers/infiniband/ulp/srp/ib_srp.c | 181 ++-- drivers/infiniband/ulp/srp/ib_srp.h | 4 +- drivers/leds/led-class.c | 11 +- drivers/memstick/core/memstick.c | 33 +- drivers/memstick/core/mspro_block.c | 4 +- drivers/memstick/host/jmb38x_ms.c | 16 +- drivers/message/fusion/mptscsih.c | 122 ++-- drivers/message/fusion/mptscsih.h | 2 +- drivers/misc/enclosure.c | 118 ++-- drivers/net/phy/phy_device.c | 8 +- drivers/net/wireless/b43/leds.c | 5 +- drivers/net/wireless/b43/main.c | 8 +- drivers/scsi/3w-9xxx.c | 9 +- drivers/scsi/3w-xxxx.c | 9 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/aacraid.h | 4 +- drivers/scsi/aacraid/linit.c | 93 ++- drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 163 ++-- drivers/scsi/ch.c | 13 +- drivers/scsi/hosts.c | 34 +- drivers/scsi/hptiop.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- drivers/scsi/ipr.c | 140 ++-- drivers/scsi/lpfc/lpfc_attr.c | 484 +++++----- drivers/scsi/lpfc/lpfc_crtn.h | 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 | 36 +- 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 | 6 +- include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 35 +- include/linux/enclosure.h | 11 +- include/linux/hw_random.h | 10 +- include/linux/init.h | 1 + include/linux/iscsi_ibft.h | 50 + include/linux/kernel.h | 6 +- include/linux/leds.h | 10 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/miscdevice.h | 10 +- include/linux/pm.h | 43 +- include/linux/pm_wakeup.h | 90 ++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- 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 | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 +- 132 files changed, 3937 insertions(+), 2325 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-ibft create mode 100644 drivers/firmware/iscsi_ibft.c create mode 100644 drivers/firmware/iscsi_ibft_find.c create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/iscsi_ibft.h 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%) ## # 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-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-clean-up-resource-alignment-management.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-fakephp-return-success-not-enodev-when-bus-rescan-is-triggered.patch pci-hotplug-fix-leaks-in-ibm-hot-plug-controller-driver-ibmphp_init_devno.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-update-via-cx700-quirk.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 454080 bytes received 1082 bytes 182064.80 bytes/sec total size is 448436 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-update-via-cx700-quirk.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-clean-up-resource-alignment-management.patch pci-hotplug-fix-leaks-in-ibm-hot-plug-controller-driver-ibmphp_init_devno.patch pci-hotplug-fakephp-return-success-not-enodev-when-bus-rescan-is-triggered.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Auto-merged Documentation/00-INDEX Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide-scan-pci.c Auto-merged drivers/ide/ide.c CONFLICT (content): Merge conflict in drivers/ide/ide.c Auto-merged include/linux/ide.h Created commit fd112a0: Resolve Patch: /home/jejb/gregkh-pci-fixup.diff ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README bitmap-add-bitmap_copy_le.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch series u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-documentation-about-usb_anchor.patch usb-add-extension-of-anchor-api-usb_unlink_anchored_urbs.patch usb-add-usb-serial-spcp8x5-driver.patch usb-add-usb_dev_reset_delayed.patch usb-add-usb_dt_cs_radio_control-define-to-ch9.h.patch usb-at91_udc-can-prefetch-data.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-clarify-usage-of-hcd-suspend-resume-methods.patch usb-convert-away-from-urb-status-in-xpad-driver.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-dummy-hcd-use-dynamic-allocation-for-platform_devices.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-qh-qtd-cleanup-comments.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-shutdown-refactored.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-ftdi_sio-note-missing-locking.patch usb-g_printer-bugfixes.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-gadget-fix-platform-driver-hotplug-coldplug.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gadget-section-fixes.patch usb-gotemp.patch usb-host-fix-platform-driver-hotplug-coldplug.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-log-an-error-message-when-usb-enumeration-fails.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-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.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-obscure-maxon-bp3-usb-device-support-16d8-6280-for-option-driver.patch usb-ohci-fix-bug-in-controller-resume.patch usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch usb-ohci-port-reset-paranoia-timeout.patch usb-option.c-add-more-device-ids.patch usb-option.c-correct-dtr-behaviour.patch usb-oti6858-fix-tcflsh-ioctl-handling.patch usb-partial-usb-embedded-host-support.patch usb-r8a66597-hcd-add-support-for-sh7366-usb-host.patch usb-r8a66597-hcd-fix-interrupt-transfer-interval.patch usb-r8a66597-hcd-fix-usb-device-connection-timing.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-superfluous-depends-on-usb_serial-from-kconfig.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-replace-remaining-__pretty_function__-occurrences.patch usb-rework-sysfs-removal-of-interface-files.patch usb-root-hubs-don-t-lie-about-their-number-of-tts.patch usb-serial-more-fixes-and-groundwork-for-tty-changes.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-serial-remove-obsolete-contact-addresses.patch usb-serial-sierra-add-new-dev-group.patch usb-serial-sierra-c597-fix.patch usb-serial-sierra-clean-up.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-support-more-huawei-data-card-product-ids.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-update-comments-about-usb-driver-s-header.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-storage-use-adaptive-dma-mask.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 wusb-add-authenticated-bit-to-usb-dev.patch wusb-add-link-wusb-usb-dev.patch wusb-add-the-uwb-include-files.patch wusb-add-usb-specific-wusb-include-files.patch wusb-devices-dont-use-a-set-address.patch wusb-documentation.patch wusb-make-ep0-reinit-available.patch wusb-teach-choose-address-about-wireless-devices.patch wusb-update-devnum.patch sent 1436096 bytes received 2644 bytes 575496.00 bytes/sec total size is 1421854 speedup is 0.99 Using base gregkh-pci usb-obscure-maxon-bp3-usb-device-support-16d8-6280-for-option-driver.patch usb-option.c-add-more-device-ids.patch usb-support-more-huawei-data-card-product-ids.patch 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-add-usb_dt_cs_radio_control-define-to-ch9.h.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 usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-serial-sierra-clean-up.patch usb-serial-sierra-c597-fix.patch usb-serial-sierra-add-new-dev-group.patch usb-add-usb-serial-spcp8x5-driver.patch u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-serial-remove-obsolete-contact-addresses.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-g_printer-bugfixes.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-ohci-fix-bug-in-controller-resume.patch usb-convert-away-from-urb-status-in-xpad-driver.patch usb-root-hubs-don-t-lie-about-their-number-of-tts.patch usb-clarify-usage-of-hcd-suspend-resume-methods.patch usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch usb-replace-remaining-__pretty_function__-occurrences.patch usb-rework-sysfs-removal-of-interface-files.patch usb-gadget-section-fixes.patch usb-dummy-hcd-use-dynamic-allocation-for-platform_devices.patch usb-at91_udc-can-prefetch-data.patch usb-ehci-shutdown-refactored.patch usb-oti6858-fix-tcflsh-ioctl-handling.patch usb-r8a66597-hcd-fix-interrupt-transfer-interval.patch usb-r8a66597-hcd-fix-usb-device-connection-timing.patch usb-r8a66597-hcd-add-support-for-sh7366-usb-host.patch usb-add-extension-of-anchor-api-usb_unlink_anchored_urbs.patch usb-remove-superfluous-depends-on-usb_serial-from-kconfig.patch usb-update-comments-about-usb-driver-s-header.patch usb-log-an-error-message-when-usb-enumeration-fails.patch usb-ehci-qh-qtd-cleanup-comments.patch usb-gadget-fix-platform-driver-hotplug-coldplug.patch usb-host-fix-platform-driver-hotplug-coldplug.patch usb-add-documentation-about-usb_anchor.patch usb-option.c-correct-dtr-behaviour.patch wusb-add-authenticated-bit-to-usb-dev.patch usb-add-usb_dev_reset_delayed.patch wusb-add-link-wusb-usb-dev.patch wusb-teach-choose-address-about-wireless-devices.patch wusb-devices-dont-use-a-set-address.patch wusb-make-ep0-reinit-available.patch wusb-update-devnum.patch wusb-documentation.patch bitmap-add-bitmap_copy_le.patch wusb-add-usb-specific-wusb-include-files.patch wusb-add-the-uwb-include-files.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-more-fixes-and-groundwork-for-tty-changes.patch usb-remove-unnecessary-type-casting-of-urb-context.patch ## # merge gregkh-usb ## Auto-merged drivers/usb/gadget/at91_udc.c Auto-merged drivers/usb/gadget/fsl_usb2_udc.c Auto-merged drivers/usb/gadget/lh7a40x_udc.c Auto-merged drivers/usb/gadget/omap_udc.c Auto-merged drivers/usb/gadget/pxa2xx_udc.c Auto-merged drivers/usb/host/isp116x-hcd.c Auto-merged drivers/usb/host/ohci-at91.c Auto-merged drivers/usb/host/ohci-ep93xx.c Auto-merged drivers/usb/host/ohci-omap.c Auto-merged drivers/usb/host/ohci-pxa27x.c Auto-merged drivers/usb/host/ohci-sm501.c Auto-merged drivers/usb/host/r8a66597-hcd.c Auto-merged drivers/usb/host/sl811-hcd.c Auto-merged drivers/usb/host/u132-hcd.c Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/WUSB-Design-overview.txt | 448 +++ Documentation/usb/anchors.txt | 50 + Documentation/usb/persist.txt | 43 +- Documentation/usb/usb-serial.txt | 7 +- Documentation/usb/wusb-cbaf | 136 + drivers/input/joystick/xpad.c | 20 +- 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 | 15 +- drivers/usb/core/hcd.c | 16 +- drivers/usb/core/hcd.h | 7 +- drivers/usb/core/hub.c | 470 ++- drivers/usb/core/hub.h | 9 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 17 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 26 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/amd5536udc.c | 10 + drivers/usb/gadget/at91_udc.c | 9 +- drivers/usb/gadget/dummy_hcd.c | 98 +- drivers/usb/gadget/epautoconf.c | 12 +- drivers/usb/gadget/ether.c | 18 +- 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/gmidi.c | 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 | 92 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 148 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 10 +- 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 | 113 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 6 +- drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 70 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-at91.c | 1 + drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 4 +- drivers/usb/host/ohci-hub.c | 67 +- drivers/usb/host/ohci-omap.c | 4 +- drivers/usb/host/ohci-pci.c | 46 +- drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 5 +- drivers/usb/host/ohci-sm501.c | 12 +- drivers/usb/host/ohci-ssb.c | 36 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 256 +- drivers/usb/host/r8a66597.h | 51 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 5127 ++++++++++++------------- drivers/usb/host/uhci-hcd.c | 16 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 3 +- drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 20 +- 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/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 | 76 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 7 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 +- drivers/usb/serial/cyberjack.c | 109 +- 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 | 53 +- 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 | 281 +- drivers/usb/serial/keyspan_pda.c | 33 +- drivers/usb/serial/kl5kusb105.c | 121 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 119 +- drivers/usb/serial/mos7840.c | 159 +- drivers/usb/serial/navman.c | 28 +- drivers/usb/serial/omninet.c | 39 +- drivers/usb/serial/option.c | 135 +- drivers/usb/serial/oti6858.c | 118 +- drivers/usb/serial/pl2303.c | 114 +- drivers/usb/serial/safe_serial.c | 57 +- drivers/usb/serial/sierra.c | 125 +- drivers/usb/serial/spcp8x5.c | 1075 ++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +- drivers/usb/serial/usb-serial.c | 91 +- drivers/usb/serial/visor.c | 94 +- drivers/usb/serial/whiteheat.c | 112 +- 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 | 26 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 104 +- drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/bitmap.h | 1 + include/linux/usb.h | 199 +- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 17 +- 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/wusb-wa.h | 284 ++ include/linux/usb/wusb.h | 420 ++ include/linux/usb_usual.h | 1 + include/linux/uwb.h | 770 ++++ include/linux/uwb/bugs-macros.h | 64 + include/linux/uwb/bugs.h | 41 + include/linux/uwb/debug-cmd.h | 57 + include/linux/uwb/debug.h | 82 + include/linux/uwb/spec.h | 650 ++++ include/linux/uwb/umc.h | 194 + include/linux/uwb/util.h | 89 + include/linux/uwb/whci.h | 117 + include/linux/wlp.h | 728 ++++ lib/bitmap.c | 20 + 183 files changed, 12270 insertions(+), 6214 deletions(-) create mode 100644 Documentation/usb/WUSB-Design-overview.txt create mode 100644 Documentation/usb/anchors.txt create mode 100644 Documentation/usb/wusb-cbaf 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 create mode 100644 include/linux/usb/wusb-wa.h create mode 100644 include/linux/usb/wusb.h create mode 100644 include/linux/uwb.h create mode 100644 include/linux/uwb/bugs-macros.h create mode 100644 include/linux/uwb/bugs.h create mode 100644 include/linux/uwb/debug-cmd.h create mode 100644 include/linux/uwb/debug.h create mode 100644 include/linux/uwb/spec.h create mode 100644 include/linux/uwb/umc.h create mode 100644 include/linux/uwb/util.h create mode 100644 include/linux/uwb/whci.h create mode 100644 include/linux/wlp.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/. gregkh-ldp base gregkh-usb ## building file list ... done ./ README add-me4000-pci-data-collection-driver.patch aectc-add-the-aectc-driver.patch dvb-add-firesat-driver.patch input-add-appleir-driver.patch net-add-alacritech-slicoss-driver.patch net-add-et131x-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch series usb-add-sensoray-2255-v4l-driver.patch video-add-the-go7007-driver.patch wusb-add-hwa-hc-wireless-host-controller-driver.patch wusb-add-the-usb-wireless-core-code.patch wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch wusb-add-the-usb-wusb-cbaf-driver.patch wusb-add-the-wireless-usb-stack-to-linux.patch sent 8853620 bytes received 378 bytes 5902665.33 bytes/sec total size is 8850756 speedup is 1.00 Using base gregkh-usb wusb-add-the-wireless-usb-stack-to-linux.patch wusb-add-the-usb-wireless-core-code.patch wusb-add-the-usb-wusb-cbaf-driver.patch wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch wusb-add-hwa-hc-wireless-host-controller-driver.patch usb-add-sensoray-2255-v4l-driver.patch dvb-add-firesat-driver.patch video-add-the-go7007-driver.patch net-add-alacritech-slicoss-driver.patch input-add-appleir-driver.patch add-me4000-pci-data-collection-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch aectc-add-the-aectc-driver.patch ## # 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(-) ## # 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/usb/gadget/Kconfig Auto-merged drivers/usb/gadget/atmel_usba_udc.c 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/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 | 302 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/Kconfig | 4 +- drivers/usb/gadget/atmel_usba_udc.c | 156 ++++++++--------- drivers/usb/gadget/atmel_usba_udc.h | 9 + 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/intc.h | 128 -------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 28 files changed, 1305 insertions(+), 766 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 ## Merge made by recursive. fs/cifs/CHANGES | 3 ++- fs/cifs/cifsacl.c | 14 ++++++++------ fs/cifs/cifsacl.h | 1 + fs/cifs/cifssmb.c | 32 ++++++++++++++++++-------------- 4 files changed, 29 insertions(+), 21 deletions(-) ## # 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 ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/powerpc/kernel/process.c Auto-merged arch/powerpc/kernel/rtas_flash.c Auto-merged arch/powerpc/kernel/setup_32.c Auto-merged arch/powerpc/oprofile/cell/vma_map.c Auto-merged arch/powerpc/platforms/powermac/setup.c Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c Auto-merged arch/powerpc/sysdev/cpm2.c Auto-merged arch/ppc/platforms/radstone_ppc7d.c Merge made by recursive. Documentation/kernel-parameters.txt | 2 + Documentation/powerpc/booting-without-of.txt | 16 - Documentation/powerpc/phyp-assisted-dump.txt | 127 +++ arch/powerpc/Kconfig | 37 +- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/Makefile | 38 +- 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 | 402 +++++++++ arch/powerpc/boot/dts/ebony.dts | 2 - arch/powerpc/boot/dts/glacier.dts | 467 +++++++++++ arch/powerpc/boot/dts/haleakala.dts | 4 +- arch/powerpc/boot/dts/katmai.dts | 2 +- arch/powerpc/boot/dts/kilauea.dts | 4 +- arch/powerpc/boot/dts/ksi8560.dts | 267 ++++++ arch/powerpc/boot/dts/makalu.dts | 4 +- arch/powerpc/boot/dts/rainier.dts | 6 +- arch/powerpc/boot/dts/sequoia.dts | 6 +- arch/powerpc/boot/dts/taishan.dts | 31 +- 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/libfdt-wrapper.c | 2 +- arch/powerpc/boot/ps3-head.S | 25 +- arch/powerpc/boot/ps3.c | 23 +- arch/powerpc/boot/simpleboot.c | 84 ++ arch/powerpc/boot/treeboot-walnut.c | 2 +- arch/powerpc/boot/virtex405-head.S | 30 + arch/powerpc/boot/wrapper | 27 +- arch/powerpc/configs/canyonlands_defconfig | 721 +++++++++++++++++ arch/powerpc/configs/chrp32_defconfig | 7 +- arch/powerpc/configs/g5_defconfig | 7 +- arch/powerpc/configs/iseries_defconfig | 7 +- arch/powerpc/configs/ksi8560_defconfig | 899 +++++++++++++++++++++ arch/powerpc/configs/maple_defconfig | 131 +++- arch/powerpc/configs/pmac32_defconfig | 7 +- arch/powerpc/configs/ppc44x_defconfig | 14 +- arch/powerpc/configs/ppc64_defconfig | 8 +- arch/powerpc/configs/pseries_defconfig | 8 +- arch/powerpc/kernel/asm-offsets.c | 4 - arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/cpu_setup_44x.S | 5 +- arch/powerpc/kernel/cputable.c | 28 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 - arch/powerpc/kernel/ibmebus.c | 12 +- arch/powerpc/kernel/iommu.c | 4 +- arch/powerpc/kernel/isa-bridge.c | 6 +- arch/powerpc/kernel/lparcfg.c | 12 +- arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/ppc_ksyms.c | 3 +- arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/prom.c | 61 ++- arch/powerpc/kernel/rtas.c | 4 +- arch/powerpc/kernel/rtas_flash.c | 2 +- arch/powerpc/kernel/rtas_pci.c | 29 +- arch/powerpc/kernel/setup-common.c | 11 +- arch/powerpc/kernel/setup_32.c | 12 + arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 5 - arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/kernel/vio.c | 10 +- arch/powerpc/lib/string.S | 14 + arch/powerpc/math-emu/fabs.c | 2 +- arch/powerpc/math-emu/fadd.c | 2 +- arch/powerpc/math-emu/fadds.c | 2 +- arch/powerpc/math-emu/fcmpo.c | 2 +- arch/powerpc/math-emu/fcmpu.c | 2 +- arch/powerpc/math-emu/fctiw.c | 2 +- arch/powerpc/math-emu/fctiwz.c | 2 +- arch/powerpc/math-emu/fdiv.c | 6 +- arch/powerpc/math-emu/fdivs.c | 6 +- arch/powerpc/math-emu/fmadd.c | 2 +- arch/powerpc/math-emu/fmadds.c | 2 +- arch/powerpc/math-emu/fmr.c | 2 +- arch/powerpc/math-emu/fmsub.c | 2 +- arch/powerpc/math-emu/fmsubs.c | 2 +- arch/powerpc/math-emu/fmul.c | 2 +- arch/powerpc/math-emu/fmuls.c | 2 +- arch/powerpc/math-emu/fnabs.c | 2 +- arch/powerpc/math-emu/fneg.c | 2 +- arch/powerpc/math-emu/fnmadd.c | 2 +- arch/powerpc/math-emu/fnmadds.c | 2 +- arch/powerpc/math-emu/fnmsub.c | 2 +- arch/powerpc/math-emu/fnmsubs.c | 2 +- arch/powerpc/math-emu/fres.c | 2 +- arch/powerpc/math-emu/frsp.c | 2 +- arch/powerpc/math-emu/frsqrte.c | 2 +- arch/powerpc/math-emu/fsel.c | 2 +- arch/powerpc/math-emu/fsqrt.c | 2 +- arch/powerpc/math-emu/fsqrts.c | 2 +- arch/powerpc/math-emu/fsub.c | 2 +- arch/powerpc/math-emu/fsubs.c | 2 +- arch/powerpc/math-emu/lfd.c | 2 +- arch/powerpc/math-emu/lfs.c | 2 +- arch/powerpc/math-emu/mcrfs.c | 4 +- arch/powerpc/math-emu/mffs.c | 2 +- arch/powerpc/math-emu/mtfsb0.c | 2 +- arch/powerpc/math-emu/mtfsb1.c | 2 +- arch/powerpc/math-emu/mtfsf.c | 2 +- arch/powerpc/math-emu/mtfsfi.c | 2 +- arch/powerpc/math-emu/stfd.c | 2 +- arch/powerpc/math-emu/stfiwx.c | 2 +- arch/powerpc/math-emu/stfs.c | 2 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 32 +- arch/powerpc/mm/init_32.c | 4 +- arch/powerpc/mm/init_64.c | 4 +- arch/powerpc/mm/mem.c | 5 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/oprofile/cell/spu_task_sync.c | 12 +- arch/powerpc/oprofile/cell/vma_map.c | 10 +- arch/powerpc/oprofile/op_model_cell.c | 14 +- arch/powerpc/platforms/40x/ep405.c | 2 + arch/powerpc/platforms/40x/kilauea.c | 4 +- arch/powerpc/platforms/40x/makalu.c | 2 + arch/powerpc/platforms/40x/virtex.c | 2 + arch/powerpc/platforms/40x/walnut.c | 4 +- arch/powerpc/platforms/44x/44x.h | 1 - arch/powerpc/platforms/44x/Kconfig | 27 + arch/powerpc/platforms/44x/Makefile | 2 + arch/powerpc/platforms/44x/bamboo.c | 15 +- arch/powerpc/platforms/44x/canyonlands.c | 63 ++ arch/powerpc/platforms/44x/ebony.c | 5 +- arch/powerpc/platforms/44x/katmai.c | 5 +- arch/powerpc/platforms/44x/misc_44x.S | 11 - arch/powerpc/platforms/44x/rainier.c | 4 +- arch/powerpc/platforms/44x/sequoia.c | 4 +- arch/powerpc/platforms/44x/taishan.c | 5 +- arch/powerpc/platforms/44x/warp-nand.c | 3 +- arch/powerpc/platforms/44x/warp.c | 6 +- arch/powerpc/platforms/52xx/lite5200.c | 4 +- arch/powerpc/platforms/85xx/Kconfig | 7 + arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/ksi8560.c | 257 ++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/Kconfig.cputype | 2 + arch/powerpc/platforms/cell/iommu.c | 10 +- arch/powerpc/platforms/cell/pervasive.c | 2 +- arch/powerpc/platforms/cell/ras.c | 10 +- arch/powerpc/platforms/cell/spu_base.c | 8 +- arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- arch/powerpc/platforms/cell/spu_manage.c | 8 +- arch/powerpc/platforms/cell/spufs/file.c | 4 +- arch/powerpc/platforms/cell/spufs/run.c | 10 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 10 +- 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/device-init.c | 78 ++- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/ps3/setup.c | 14 +- arch/powerpc/platforms/ps3/spu.c | 7 + arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/eeh.c | 5 +- arch/powerpc/platforms/pseries/lpar.c | 15 + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++ arch/powerpc/platforms/pseries/reconfig.c | 12 +- arch/powerpc/platforms/pseries/scanlog.c | 37 +- arch/powerpc/platforms/pseries/setup.c | 4 + arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/cpm1.c | 2 +- arch/powerpc/sysdev/cpm2.c | 2 +- arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 +- arch/powerpc/sysdev/ppc4xx_pci.c | 133 +++- arch/powerpc/sysdev/ppc4xx_pci.h | 59 ++ arch/powerpc/sysdev/ppc4xx_soc.c | 200 +++++ arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- arch/powerpc/sysdev/qe_lib/ucc_fast.c | 32 +- arch/powerpc/sysdev/qe_lib/ucc_slow.c | 18 +- arch/powerpc/sysdev/tsi108_dev.c | 4 +- arch/powerpc/sysdev/tsi108_pci.c | 4 +- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/8xx_io/fec.c | 4 +- arch/ppc/kernel/head.S | 17 - arch/ppc/mm/init.c | 1 - arch/ppc/platforms/radstone_ppc7d.c | 8 +- arch/ppc/syslib/mpc52xx_setup.c | 2 +- arch/sparc64/Kconfig | 1 + drivers/block/viodasd.c | 2 +- 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 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 ++++++-- drivers/net/pasemi_mac.h | 35 +- drivers/net/pasemi_mac_ethtool.c | 159 ++++ drivers/net/ps3_gelic_net.c | 81 ++ drivers/net/ps3_gelic_net.h | 20 + drivers/of/base.c | 26 + drivers/ps3/ps3-sys-manager.c | 74 ++- drivers/ps3/sys-manager-core.c | 16 +- drivers/serial/of_serial.c | 4 +- include/asm-powerpc/Kbuild | 2 +- include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/dcr-native.h | 17 + include/asm-powerpc/dcr-regs.h | 78 ++ include/asm-powerpc/lmb.h | 82 +-- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 ++- include/asm-powerpc/pgtable-ppc32.h | 3 +- include/asm-powerpc/phyp_dump.h | 45 + include/asm-powerpc/ppc4xx.h | 18 + include/asm-powerpc/ps3.h | 7 +- include/asm-powerpc/sparsemem.h | 1 + include/asm-powerpc/string.h | 2 + include/asm-sparc64/lmb.h | 10 + include/linux/lmb.h | 83 ++ include/linux/of.h | 1 + lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 ++-- 233 files changed, 6757 insertions(+), 864 deletions(-) create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt 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/ksi8560.dts create mode 100644 arch/powerpc/boot/dts/yosemite.dts create mode 100644 arch/powerpc/boot/simpleboot.c create mode 100644 arch/powerpc/boot/virtex405-head.S create mode 100644 arch/powerpc/configs/canyonlands_defconfig create mode 100644 arch/powerpc/configs/ksi8560_defconfig create mode 100644 arch/powerpc/platforms/44x/canyonlands.c create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-powerpc/phyp_dump.h create mode 100644 include/asm-powerpc/ppc4xx.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 | 9 + Documentation/video4linux/CARDLIST.saa7134 | 9 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 2 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 96 ++- 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-common.h | 17 +- drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 113 +- drivers/media/dvb/b2c2/flexcop-i2c.c | 180 ++- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- drivers/media/dvb/b2c2/flexcop.c | 10 +- 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/dvb-usb/dib0700.h | 4 + drivers/media/dvb/dvb-usb/dib0700_core.c | 4 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++++- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- drivers/media/dvb/dvb-usb/ttusb2.c | 62 +- drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 304 +++-- drivers/media/dvb/frontends/cx24123.h | 21 +- 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 | 418 ++--- 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 | 9 +- 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 | 33 +- 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 | 10 +- drivers/media/video/cx88/cx88-cards.c | 581 ++++++- drivers/media/video/cx88/cx88-core.c | 13 +- drivers/media/video/cx88/cx88-dvb.c | 245 +++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 15 +- 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 | 63 +- drivers/media/video/cx88/cx88.h | 14 +- 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 | 7 +- 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 | 1000 +++++++++++ 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 | 427 +++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 418 ++++-- drivers/media/