$ git checkout master Already on branch "master" $ git reset --hard stable HEAD is now at cc7feea... Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc Merging origin/master $ git merge origin/master Updating cc7feea..a4083c9 Fast forward Auto packing your repository for optimum performance. You may also run "git gc" manually. See "git help gc" for more information. Documentation/hw_random.txt | 59 +++++--- Documentation/kernel-parameters.txt | 4 + Makefile | 2 +- arch/powerpc/boot/dts/lite5200b.dts | 2 +- arch/powerpc/configs/ep8248e_defconfig | 74 +++++++--- arch/powerpc/configs/ep88xc_defconfig | 56 +++++--- arch/powerpc/configs/linkstation_defconfig | 131 +++++++++++------ arch/powerpc/configs/mpc7448_hpc2_defconfig | 119 ++++++++++++---- arch/powerpc/configs/mpc8272_ads_defconfig | 75 ++++++++-- arch/powerpc/configs/mpc8313_rdb_defconfig | 114 ++++++++++----- arch/powerpc/configs/mpc8315_rdb_defconfig | 110 ++++++++++----- arch/powerpc/configs/mpc832x_mds_defconfig | 101 +++++++++---- arch/powerpc/configs/mpc832x_rdb_defconfig | 106 +++++++++----- arch/powerpc/configs/mpc834x_itx_defconfig | 111 +++++++++------ arch/powerpc/configs/mpc834x_itxgp_defconfig | 109 +++++++++------ arch/powerpc/configs/mpc834x_mds_defconfig | 104 +++++++++----- arch/powerpc/configs/mpc836x_mds_defconfig | 102 +++++++++---- arch/powerpc/configs/mpc837x_mds_defconfig | 197 ++++++++++++++------------ arch/powerpc/configs/mpc837x_rdb_defconfig | 83 +++++++---- arch/powerpc/configs/mpc83xx_defconfig | 88 ++++++++---- arch/powerpc/configs/mpc8540_ads_defconfig | 121 ++++++++++++---- arch/powerpc/configs/mpc8544_ds_defconfig | 127 ++++++++++++----- arch/powerpc/configs/mpc8560_ads_defconfig | 126 +++++++++++++---- arch/powerpc/configs/mpc8568mds_defconfig | 106 ++++++++++---- arch/powerpc/configs/mpc8572_ds_defconfig | 127 ++++++++++++----- arch/powerpc/configs/mpc85xx_cds_defconfig | 131 +++++++++++++---- arch/powerpc/configs/mpc85xx_defconfig | 111 ++++++++++----- arch/powerpc/configs/mpc8610_hpcd_defconfig | 131 ++++++++++++++---- arch/powerpc/configs/mpc8641_hpcn_defconfig | 115 ++++++++++----- arch/powerpc/configs/mpc866_ads_defconfig | 112 +++++++++++---- arch/powerpc/configs/mpc885_ads_defconfig | 56 +++++--- arch/powerpc/configs/pq2fads_defconfig | 89 +++++++++--- arch/powerpc/configs/prpmc2800_defconfig | 160 +++++++++++++++------ arch/powerpc/configs/sbc834x_defconfig | 78 +++++++---- arch/powerpc/configs/sbc8548_defconfig | 115 ++++++++++++--- arch/powerpc/configs/sbc8560_defconfig | 124 ++++++++++++---- arch/powerpc/configs/storcenter_defconfig | 102 ++++++++------ arch/powerpc/configs/stx_gp3_defconfig | 154 +++++++++++++++------ arch/powerpc/configs/tqm8540_defconfig | 133 +++++++++++++----- arch/powerpc/configs/tqm8541_defconfig | 133 +++++++++++++----- arch/powerpc/configs/tqm8555_defconfig | 133 +++++++++++++----- arch/powerpc/configs/tqm8560_defconfig | 133 +++++++++++++----- drivers/ata/ahci.c | 6 +- drivers/ata/libata-core.c | 48 ++++--- drivers/ata/libata-scsi.c | 14 ++- drivers/ata/pata_it821x.c | 2 +- drivers/ata/sata_promise.c | 109 ++++++++++++--- drivers/base/core.c | 5 + drivers/char/hw_random/Kconfig | 9 +- drivers/mtd/devices/block2mtd.c | 1 - drivers/net/usb/rtl8150.c | 2 +- drivers/pci/intel-iommu.c | 7 + drivers/pci/pci.c | 21 --- drivers/uio/uio.c | 2 + drivers/usb/core/message.c | 5 +- drivers/usb/core/quirks.c | 3 + drivers/usb/gadget/inode.c | 4 +- drivers/usb/host/ehci-pci.c | 14 ++ drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/sierra.c | 18 ++- drivers/usb/storage/isd200.c | 1 + drivers/usb/storage/transport.c | 3 +- drivers/usb/storage/unusual_devs.h | 11 ++ fs/sysfs/file.c | 8 +- include/linux/libata.h | 8 +- include/linux/pci.h | 4 - include/linux/usb/quirks.h | 3 + include/linux/usb_usual.h | 4 +- kernel/acct.c | 23 +++- kernel/marker.c | 31 ++--- kernel/printk.c | 83 ++++++----- mm/bootmem.c | 25 +++- mm/vmscan.c | 27 +--- scripts/Makefile.modpost | 6 +- scripts/mod/file2alias.c | 4 + scripts/mod/modpost.c | 5 +- scripts/mod/modpost.h | 1 + security/smack/smackfs.c | 35 +----- 79 files changed, 3426 insertions(+), 1492 deletions(-) Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged MAINTAINERS Auto-merged drivers/ata/ahci.c Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/base/core.c Auto-merged fs/sysfs/file.c CONFLICT (content): Merge conflict in fs/sysfs/file.c Auto-merged include/linux/libata.h Auto-merged scripts/mod/file2alias.c Recorded preimage for 'fs/sysfs/file.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 ++-- drivers/base/base.h | 11 - drivers/base/bus.c | 17 +- drivers/base/class.c | 640 +------------------- drivers/base/core.c | 30 +- 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 | 66 +-- 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/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/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/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_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 14 + fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 118 +---- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 +++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 14 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 61 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 116 files changed, 2735 insertions(+), 2889 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) Merging quilt/pci $ git merge quilt/pci Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt Auto-merged drivers/ide/ide.c Auto-merged drivers/pci/intel-iommu.c Auto-merged drivers/pci/pci.c Auto-merged include/linux/pci.h Resolved 'Documentation/ide/ide.txt' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/00-INDEX | 10 - Documentation/ABI/testing/sysfs-bus-pci | 11 + Documentation/PCI/00-INDEX | 12 + Documentation/{ => PCI}/PCIEBUS-HOWTO.txt | 12 +- Documentation/{ => PCI}/pci-error-recovery.txt | 0 Documentation/{ => PCI}/pci.txt | 2 +- Documentation/{ => PCI}/pcieaer-howto.txt | 2 +- Documentation/ide/ide.txt | 2 - Documentation/kernel-parameters.txt | 10 +- Documentation/memory-barriers.txt | 4 +- arch/alpha/kernel/pci.c | 23 +- arch/arm/kernel/bios32.c | 27 +- arch/cris/arch-v32/drivers/pci/bios.c | 34 +- arch/frv/mb93090-mb00/pci-frv.c | 32 - arch/frv/mb93090-mb00/pci-frv.h | 3 - arch/frv/mb93090-mb00/pci-vdk.c | 55 +-- arch/ia64/pci/pci.c | 44 +-- arch/mips/pci/pci.c | 40 +-- arch/mn10300/unit-asb2305/pci-asb2305.c | 39 -- arch/mn10300/unit-asb2305/pci-asb2305.h | 3 - arch/mn10300/unit-asb2305/pci.c | 2 +- arch/parisc/kernel/pci.c | 30 +- arch/powerpc/kernel/pci-common.c | 34 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- arch/ppc/kernel/pci.c | 59 +-- arch/sh/drivers/pci/pci-sh4.h | 2 - arch/sh/drivers/pci/pci.c | 29 +- arch/sparc64/kernel/pci.c | 27 +- arch/v850/kernel/rte_mb_a_pci.c | 25 +- arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/pci/acpi.c | 11 +- arch/x86/pci/common.c | 63 +-- arch/x86/pci/i386.c | 38 -- arch/x86/pci/pcbios.c | 72 --- arch/x86/pci/pci.h | 4 - arch/xtensa/kernel/pci.c | 57 +-- drivers/ide/Kconfig | 9 +- drivers/ide/ide-scan-pci.c | 9 +- drivers/ide/ide.c | 12 - drivers/parisc/dino.c | 1 - drivers/pci/access.c | 166 +++++ drivers/pci/bus.c | 15 +- drivers/pci/hotplug/Kconfig | 4 +- drivers/pci/hotplug/acpi_pcihp.c | 24 +- drivers/pci/hotplug/acpiphp_core.c | 18 +- drivers/pci/hotplug/acpiphp_glue.c | 38 +- drivers/pci/hotplug/acpiphp_ibm.c | 36 +- drivers/pci/hotplug/cpci_hotplug_core.c | 60 +- drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- drivers/pci/hotplug/cpcihp_generic.c | 8 +- drivers/pci/hotplug/cpqphp.h | 6 +- drivers/pci/hotplug/cpqphp_core.c | 38 +- drivers/pci/hotplug/cpqphp_ctrl.c | 64 +- drivers/pci/hotplug/cpqphp_nvram.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 8 +- drivers/pci/hotplug/fakephp.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 24 +- drivers/pci/hotplug/ibmphp_ebda.c | 92 ++-- drivers/pci/hotplug/ibmphp_hpc.c | 68 +- drivers/pci/hotplug/ibmphp_pci.c | 18 +- drivers/pci/hotplug/ibmphp_res.c | 12 +- drivers/pci/hotplug/pci_hotplug_core.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_core.c | 32 +- drivers/pci/hotplug/pciehp_ctrl.c | 34 +- drivers/pci/hotplug/pciehp_hpc.c | 144 +++--- drivers/pci/hotplug/pciehp_pci.c | 8 +- drivers/pci/hotplug/pcihp_skeleton.c | 18 +- drivers/pci/hotplug/rpadlpar_core.c | 20 +- drivers/pci/hotplug/rpaphp_core.c | 6 +- drivers/pci/hotplug/rpaphp_pci.c | 14 +- drivers/pci/hotplug/rpaphp_slot.c | 6 +- drivers/pci/hotplug/sgi_hotplug.c | 8 +- drivers/pci/hotplug/shpchp.h | 6 +- drivers/pci/hotplug/shpchp_core.c | 26 +- drivers/pci/hotplug/shpchp_ctrl.c | 46 +- drivers/pci/hotplug/shpchp_hpc.c | 64 +- drivers/pci/hotplug/shpchp_pci.c | 4 +- drivers/pci/intel-iommu.c | 147 ++++- drivers/pci/iova.c | 50 +- drivers/pci/iova.h | 2 + drivers/pci/pci-sysfs.c | 114 +++- drivers/pci/pci.c | 6 +- drivers/pci/pci.h | 19 + drivers/pci/pcie/Kconfig | 20 + drivers/pci/pcie/Makefile | 3 + drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 3 + drivers/pci/pcie/aer/aerdrv_core.c | 5 +- drivers/pci/pcie/aspm.c | 811 ++++++++++++++++++++++++ drivers/pci/pcie/portdrv_core.c | 4 +- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 68 +-- drivers/pci/quirks.c | 4 +- drivers/pci/remove.c | 14 +- drivers/pci/search.c | 313 ++++------ drivers/pci/setup-res.c | 45 ++- include/asm-sh/mpc1211/pci.h | 2 - include/linux/aer.h | 5 - include/linux/ide.h | 1 - include/linux/pci-aspm.h | 56 ++ include/linux/pci.h | 30 +- include/linux/pci_regs.h | 8 + 103 files changed, 2153 insertions(+), 1595 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci create mode 100644 Documentation/PCI/00-INDEX rename Documentation/{ => PCI}/PCIEBUS-HOWTO.txt (98%) rename Documentation/{ => PCI}/pci-error-recovery.txt (100%) rename Documentation/{ => PCI}/pci.txt (99%) rename Documentation/{ => PCI}/pcieaer-howto.txt (99%) create mode 100644 drivers/pci/pcie/aspm.c create mode 100644 include/linux/pci-aspm.h Merging quilt/usb $ git merge quilt/usb Auto-merged drivers/usb/core/message.c Auto-merged drivers/usb/core/quirks.c Auto-merged drivers/usb/gadget/inode.c Auto-merged drivers/usb/host/ehci-pci.c Auto-merged drivers/usb/serial/pl2303.c Auto-merged drivers/usb/serial/sierra.c CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c Auto-merged drivers/usb/storage/transport.c Auto-merged drivers/usb/storage/unusual_devs.h Auto-merged include/linux/usb/quirks.h CONFLICT (content): Merge conflict in include/linux/usb/quirks.h Auto-merged include/linux/usb_usual.h Recorded preimage for 'drivers/usb/serial/sierra.c' Recorded preimage for 'include/linux/usb/quirks.h' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- drivers/block/ub.c | 76 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +++++--- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 14 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 ++-- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 6 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 ++-- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 72 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 7 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 7 +- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 29 +- drivers/usb/misc/Makefile | 1 + drivers/usb/misc/adutux.c | 120 ++-- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 ++-- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/gotemp.c | 295 +++++++ drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 ++-- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 ++-- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++++++------- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 ++-- drivers/usb/serial/garmin_gps.c | 112 ++-- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 ++++---- drivers/usb/serial/io_ti.c | 392 +++++----- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 ++-- drivers/usb/serial/keyspan.c | 262 +++--- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 ++-- drivers/usb/serial/mos7840.c | 159 ++-- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 ++-- drivers/usb/serial/pl2303.c | 112 ++-- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 66 +- drivers/usb/serial/spcp8x5.c | 1075 +++++++++++++++++++++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +++--- drivers/usb/serial/usb-serial.c | 89 ++- drivers/usb/serial/visor.c | 92 ++-- drivers/usb/serial/whiteheat.c | 110 ++-- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 +++++ drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 12 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 8 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 181 +++-- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 16 +- include/linux/usb/g_printer.h | 4 + include/linux/usb/gadget.h | 2 +- include/linux/usb/gadgetfs.h | 16 +- include/linux/usb/input.h | 8 +- include/linux/usb/iowarrior.h | 6 +- include/linux/usb/isp116x.h | 6 +- include/linux/usb/midi.h | 2 +- include/linux/usb/net2280.h | 9 +- include/linux/usb/otg.h | 6 +- include/linux/usb/quirks.h | 5 + include/linux/usb/rndis_host.h | 9 +- include/linux/usb/serial.h | 3 +- include/linux/usb/sl811.h | 5 +- include/linux/usb/usbnet.h | 8 +- include/linux/usb_usual.h | 1 + 159 files changed, 4940 insertions(+), 3187 deletions(-) create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/spcp8x5.c create mode 100644 drivers/usb/storage/cypress_atacb.c create mode 100644 drivers/usb/storage/cypress_atacb.h Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-crypt.c | 58 +++++++++++++++++++++++++----------------------- drivers/md/dm-io.c | 2 +- drivers/md/dm-raid1.c | 4 +- drivers/md/dm-snap.c | 2 +- drivers/md/kcopyd.c | 10 ++++---- drivers/md/kcopyd.h | 4 +- 6 files changed, 41 insertions(+), 39 deletions(-) Merging hid/mm $ git merge hid/mm Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/hid-quirks.c Merge made by recursive. drivers/hid/hid-core.c | 4 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 22 +++- drivers/hid/usbhid/hid-core.c | 40 ++++--- drivers/hid/usbhid/hid-quirks.c | 54 ++++++++ drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- include/linux/hid.h | 5 +- 7 files changed, 256 insertions(+), 157 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Auto-merged MAINTAINERS Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. MAINTAINERS | 2 + drivers/i2c/algos/Kconfig | 39 +-- drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- drivers/i2c/algos/i2c-algo-pca.h | 26 -- drivers/i2c/busses/Kconfig | 58 +++-- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++- drivers/i2c/busses/i2c-omap.c | 36 ++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/chips/isp1301_omap.c | 87 +++--- drivers/i2c/i2c-core.c | 6 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- include/linux/i2c-pca-platform.h | 12 + sound/soc/codecs/tlv320aic3x.c | 2 - 23 files changed, 1536 insertions(+), 433 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-pca-platform.c create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h create mode 100644 include/linux/i2c-pca-platform.h Merging quilt/kernel-doc $ git merge quilt/kernel-doc Auto-merged Documentation/00-INDEX Auto-merged kernel/audit.c Auto-merged scripts/kernel-doc Merge made by recursive. Documentation/00-INDEX | 2 - Documentation/kbuild/00-INDEX | 4 + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ Documentation/{ => kbuild}/smart-config.txt | 2 +- Documentation/spi/spidev | 168 +----------------------- Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ README | 32 +++-- kernel/audit.c | 4 +- scripts/kernel-doc | 20 ++- 9 files changed, 388 insertions(+), 190 deletions(-) create mode 100644 Documentation/kbuild/make-configs.txt rename Documentation/{ => kbuild}/smart-config.txt (99%) create mode 100644 Documentation/spi/spidev_fdx.c Merging avr32/avr32-arch $ git merge avr32/avr32-arch Removed arch/avr32/mach-at32ap/time-tc.c Auto-merged drivers/misc/Kconfig Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/kernel/traps.c | 4 + arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 305 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.c | 126 +++++--------- include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/byteorder.h | 6 + include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/asm-avr32/processor.h | 2 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 29 files changed, 1278 insertions(+), 765 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h Merging v4l-dvb/stable $ git merge v4l-dvb/stable Merge made by recursive. Documentation/video4linux/CARDLIST.bttv | 2 + Documentation/video4linux/CARDLIST.cx88 | 8 + Documentation/video4linux/CARDLIST.saa7134 | 7 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 7 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 53 +- drivers/media/common/saa7146_core.c | 8 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +- 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/cxusb.c | 1 - drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 2 +- 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 | 26 +- drivers/media/dvb/frontends/tda18271-fe.c | 309 ++--- drivers/media/dvb/frontends/tda18271-priv.h | 8 +- drivers/media/dvb/frontends/tda18271-tables.c | 84 +- drivers/media/dvb/frontends/tda18271.h | 11 +- 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/miropcm20-rds.c | 2 +- drivers/media/radio/radio-cadet.c | 10 +- drivers/media/radio/radio-sf16fmr2.c | 102 +- drivers/media/radio/radio-typhoon.c | 2 +- drivers/media/video/Kconfig | 45 + drivers/media/video/Makefile | 8 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 4 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 55 +- drivers/media/video/bt8xx/bttv-driver.c | 43 +- drivers/media/video/bt8xx/bttv-input.c | 6 + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 2 + drivers/media/video/bw-qcam.c | 4 +- drivers/media/video/c-qcam.c | 4 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 7 +- 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/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 6 +- drivers/media/video/cx88/cx88-cards.c | 529 ++++++- drivers/media/video/cx88/cx88-core.c | 8 +- drivers/media/video/cx88/cx88-dvb.c | 163 ++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 9 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 17 +- drivers/media/video/cx88/cx88.h | 8 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/media/video/em28xx/em28xx-core.c | 24 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- 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 | 12 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 9 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 846 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/pms.c | 4 +- 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 | 8 +- drivers/media/video/pxa_camera.c | 985 +++++++++++ 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/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 347 ++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 346 +++-- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-reg.h | 3 + drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 17 +- drivers/media/video/saa7134/saa7134.h | 16 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 4 +- drivers/media/video/sn9c102/sn9c102_core.c | 4 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/soc_camera.c | 998 +++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 4 +- drivers/media/video/stv680.c | 9 +- drivers/media/video/tda8290.c | 12 +- drivers/media/video/tda8290.h | 2 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 42 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 47 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 824 +++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 33 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 6 +- drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- drivers/media/video/videobuf-core.c | 7 +- drivers/media/video/videobuf-dma-sg.c | 121 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 4 +- drivers/media/video/w9968cf.c | 2 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_device.c | 5 +- drivers/media/video/zoran_driver.c | 2 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/ir-common.h | 1 + include/media/soc_camera.h | 173 ++ include/media/tuner-types.h | 17 +- include/media/tuner.h | 2 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-core.h | 4 +- include/media/videobuf-dma-sg.h | 14 +- 213 files changed, 9274 insertions(+), 2572 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h $ git revert fb901061c4d21a9d700e174fa08338cd60475ee6 Finished one revert. Created commit 6fd6809: Revert "V4L/DVB (7398): Adds an error if priv argument of tuner_callback is NULL" 2 files changed, 26 insertions(+), 32 deletions(-) $ git revert f7985c0f5c180cea13014d1e54b42b9e38655bb9 Finished one revert. Created commit 5075062: Revert "V4L/DVB (7396): saa7134: fixed pointer in tuner callback" 2 files changed, 3 insertions(+), 1 deletions(-) $ git revert eeb7bce61b48f9b442b022a437e6bcb5357df41f Finished one revert. Created commit 150a86f: Revert "V4L/DVB (7395): saa7134: start 2nd LND supply of Medion cards only if needed" 1 files changed, 5 insertions(+), 7 deletions(-) $ git revert 2e1b10f0e7569cf4bcf75c695b22fbe6a5b7b438 Auto-merged drivers/media/video/saa7134/saa7134-core.c Auto-merged drivers/media/video/tuner-core.c Finished one revert. Created commit 69cbb6a: Revert "V4L/DVB (7393): tda827x: fixed support of tuners with LNA" 10 files changed, 187 insertions(+), 164 deletions(-) Merging s390/features $ git merge s390/features Auto-merged kernel/sched.c Merge made by recursive. arch/s390/Kconfig | 4 + arch/s390/defconfig | 4 +- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/compat_signal.c | 10 + arch/s390/kernel/early.c | 14 ++ arch/s390/kernel/head64.S | 12 ++- arch/s390/kernel/setup.c | 32 ++-- arch/s390/kernel/signal.c | 10 + arch/s390/kernel/smp.c | 87 +++++++++- arch/s390/kernel/time.c | 2 +- arch/s390/kernel/topology.c | 316 +++++++++++++++++++++++++++++++++++ arch/s390/mm/Makefile | 2 +- arch/s390/mm/fault.c | 3 + arch/s390/mm/hugetlbpage.c | 134 +++++++++++++++ arch/s390/mm/init.c | 23 --- arch/s390/mm/vmem.c | 55 ++++++- drivers/base/topology.c | 17 +- drivers/char/hw_random/core.c | 4 + drivers/crypto/Kconfig | 1 + drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_3990_erp.c | 34 ++++ drivers/s390/block/dasd_eckd.c | 7 + drivers/s390/block/dasd_int.h | 6 + drivers/s390/cio/chsc.c | 12 +- drivers/s390/cio/css.c | 5 + drivers/s390/cio/css.h | 1 + drivers/s390/crypto/zcrypt_api.c | 120 +++++++++++++ drivers/s390/crypto/zcrypt_api.h | 8 + drivers/s390/crypto/zcrypt_pcixcc.c | 199 ++++++++++++++++++++++- drivers/s390/sysinfo.c | 116 ++----------- fs/Kconfig | 3 +- include/asm-s390/page.h | 29 +++- include/asm-s390/pgtable.h | 158 +++++++++++++++++ include/asm-s390/setup.h | 4 + include/asm-s390/smp.h | 3 + include/asm-s390/sysinfo.h | 117 +++++++++++++ include/asm-s390/system.h | 12 ++ include/asm-s390/timex.h | 12 +- include/asm-s390/tlbflush.h | 34 +++-- include/asm-s390/topology.h | 25 +++ include/linux/hugetlb.h | 22 +++ mm/hugetlb.c | 37 +++-- 43 files changed, 1494 insertions(+), 204 deletions(-) create mode 100644 arch/s390/kernel/topology.c create mode 100644 arch/s390/mm/hugetlbpage.c create mode 100644 include/asm-s390/sysinfo.h Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 19 +- arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 1 + arch/sh/boards/renesas/migor/setup.c | 197 +++++- arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +- arch/sh/boards/renesas/r7780rp/setup.c | 42 +- arch/sh/boards/se/7721/Makefile | 1 + arch/sh/boards/se/7721/irq.c | 45 ++ arch/sh/boards/se/7721/setup.c | 99 +++ arch/sh/boards/se/7722/setup.c | 41 + arch/sh/configs/se7721_defconfig | 1085 ++++++++++++++++++++++++++ arch/sh/kernel/cf-enabler.c | 15 +- arch/sh/kernel/cpu/sh2a/Makefile | 7 +- arch/sh/kernel/cpu/sh2a/probe.c | 3 + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 168 ++++ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 28 +- arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 37 +- arch/sh/kernel/setup.c | 15 + arch/sh/lib/clear_page.S | 6 +- arch/sh/lib/copy_page.S | 6 +- arch/sh/mm/cache-debugfs.c | 4 +- arch/sh/mm/pmb.c | 2 +- arch/sh/tools/mach-types | 5 +- drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/sh_keysc.c | 280 +++++++ drivers/rtc/rtc-sh.c | 296 +++++--- include/asm-sh/bugs.h | 2 +- include/asm-sh/migor.h | 58 ++ include/asm-sh/processor.h | 2 +- include/asm-sh/r7780rp.h | 22 +- include/asm-sh/se7721.h | 70 ++ include/asm-sh/se7722.h | 2 + include/asm-sh/sh_keysc.h | 13 + include/asm-sh/system.h | 2 + include/asm-sh/uaccess_32.h | 5 +- 36 files changed, 2462 insertions(+), 178 deletions(-) create mode 100644 arch/sh/boards/se/7721/Makefile create mode 100644 arch/sh/boards/se/7721/irq.c create mode 100644 arch/sh/boards/se/7721/setup.c create mode 100644 arch/sh/configs/se7721_defconfig create mode 100644 arch/sh/kernel/cpu/sh2a/setup-mxg.c create mode 100644 drivers/input/keyboard/sh_keysc.c create mode 100644 include/asm-sh/migor.h create mode 100644 include/asm-sh/se7721.h create mode 100644 include/asm-sh/sh_keysc.h Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_dmap.c | 11 +++++------ fs/jfs/jfs_dmap.h | 2 +- fs/jfs/jfs_imap.c | 15 ++++++--------- fs/jfs/jfs_xtree.c | 26 ++++++++------------------ 4 files changed, 20 insertions(+), 34 deletions(-) Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide 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 Removed include/linux/hdsmart.h Auto-merged include/linux/ide.h Recorded preimage for 'Documentation/ide/ide.txt' Recorded preimage for 'drivers/ide/ide.c' Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/ide/ide-tape.txt | 211 ++---- Documentation/ide/ide.txt | 144 +--- Documentation/ide/warm-plug-howto.txt | 13 + Documentation/kernel-parameters.txt | 7 - 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 | 35 +- drivers/ide/Makefile | 2 +- drivers/ide/arm/bast-ide.c | 18 +- drivers/ide/arm/icside.c | 61 +- drivers/ide/arm/ide_arm.c | 20 +- drivers/ide/arm/palm_bk3710.c | 59 +- drivers/ide/arm/rapide.c | 5 +- drivers/ide/cris/ide-cris.c | 55 +- drivers/ide/h8300/ide-h8300.c | 5 +- drivers/ide/ide-acpi.c | 32 +- drivers/ide/ide-cd.c | 923 +++++++++----------- drivers/ide/ide-cd.h | 4 - drivers/ide/ide-disk.c | 159 ++-- drivers/ide/ide-dma.c | 155 +--- drivers/ide/ide-floppy.c | 368 ++++----- drivers/ide/ide-generic.c | 119 +++- drivers/ide/ide-io.c | 55 +- drivers/ide/ide-iops.c | 120 ++- drivers/ide/ide-lib.c | 44 +- drivers/ide/ide-pnp.c | 46 +- drivers/ide/ide-probe.c | 378 +++++++-- drivers/ide/ide-proc.c | 180 ++--- drivers/ide/ide-scan-pci.c | 2 +- drivers/ide/ide-tape.c | 1350 ++++++----------------------- drivers/ide/ide-taskfile.c | 48 +- drivers/ide/ide.c | 1150 ++++++------------------- drivers/ide/legacy/Makefile | 1 + drivers/ide/legacy/ali14xx.c | 32 +- drivers/ide/legacy/buddha.c | 5 +- drivers/ide/legacy/dtc2278.c | 27 +- drivers/ide/legacy/falconide.c | 9 +- drivers/ide/legacy/gayle.c | 10 +- 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 | 8 +- drivers/ide/legacy/macide.c | 5 +- drivers/ide/legacy/q40ide.c | 4 +- drivers/ide/legacy/qd65xx.c | 223 ++--- drivers/ide/legacy/qd65xx.h | 1 - drivers/ide/legacy/umc8672.c | 80 +- drivers/ide/mips/au1xxx-ide.c | 128 +-- drivers/ide/mips/swarm.c | 13 +- drivers/ide/pci/aec62xx.c | 39 +- drivers/ide/pci/alim15x3.c | 92 ++- drivers/ide/pci/amd74xx.c | 19 +- drivers/ide/pci/atiixp.c | 29 +- drivers/ide/pci/cmd640.c | 308 ++++---- 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 | 187 ++--- drivers/ide/pci/it8213.c | 34 +- drivers/ide/pci/it821x.c | 52 +- drivers/ide/pci/jmicron.c | 29 +- drivers/ide/pci/ns87415.c | 32 +- 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 | 80 +- drivers/ide/pci/serverworks.c | 38 +- drivers/ide/pci/sgiioc4.c | 134 ++-- drivers/ide/pci/siimage.c | 150 ++-- 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 | 45 +- drivers/ide/pci/via82cxxx.c | 20 +- drivers/ide/ppc/mpc8xx.c | 138 ++-- drivers/ide/ppc/pmac.c | 280 +++---- drivers/ide/setup-pci.c | 227 ++--- drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 209 ++--- include/asm-alpha/ide.h | 11 - include/asm-arm/ide.h | 8 - include/asm-blackfin/ide.h | 4 - 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 | 334 ++++---- 139 files changed, 4293 insertions(+), 6687 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 Merging libata/NEXT $ git merge libata/NEXT Auto-merged drivers/ata/ahci.c Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/scsi/ipr.c Auto-merged include/linux/libata.h Merge made by recursive. drivers/ata/ahci.c | 177 +++++-------------------- drivers/ata/ata_generic.c | 49 +------- drivers/ata/ata_piix.c | 185 +++----------------------- drivers/ata/libata-core.c | 157 ++++++++++++++++++---- drivers/ata/libata-eh.c | 139 +++++++++----------- drivers/ata/libata-pmp.c | 104 ++++----------- drivers/ata/libata-scsi.c | 7 +- drivers/ata/libata-sff.c | 66 +++++----- drivers/ata/pata_acpi.c | 71 +--------- drivers/ata/pata_ali.c | 161 ++++------------------- drivers/ata/pata_amd.c | 256 ++++++------------------------------ drivers/ata/pata_artop.c | 121 ++--------------- drivers/ata/pata_at32.c | 44 +------ drivers/ata/pata_atiixp.c | 55 +------- drivers/ata/pata_bf54x.c | 33 +---- drivers/ata/pata_cmd640.c | 73 ++++------- drivers/ata/pata_cmd64x.c | 135 ++++--------------- drivers/ata/pata_cs5520.c | 58 +++------ drivers/ata/pata_cs5530.c | 70 ++++------- drivers/ata/pata_cs5535.c | 50 +------- drivers/ata/pata_cs5536.c | 50 +------- drivers/ata/pata_cypress.c | 50 +------- drivers/ata/pata_efar.c | 64 +-------- drivers/ata/pata_hpt366.c | 75 ++++-------- drivers/ata/pata_hpt37x.c | 237 +++++++-------------------------- drivers/ata/pata_hpt3x2n.c | 77 +++--------- drivers/ata/pata_hpt3x3.c | 50 +------- drivers/ata/pata_icside.c | 59 ++------- drivers/ata/pata_isapnp.c | 37 +----- drivers/ata/pata_it8213.c | 65 +-------- drivers/ata/pata_it821x.c | 91 ++++---------- drivers/ata/pata_ixp4xx_cf.c | 40 +----- drivers/ata/pata_jmicron.c | 66 +--------- drivers/ata/pata_legacy.c | 276 +++------------------------------------ drivers/ata/pata_marvell.c | 67 +--------- drivers/ata/pata_mpc52xx.c | 42 +------ drivers/ata/pata_mpiix.c | 55 +------- drivers/ata/pata_netcell.c | 56 ++------- drivers/ata/pata_ninja32.c | 46 +------ drivers/ata/pata_ns87410.c | 60 +-------- drivers/ata/pata_ns87415.c | 94 +++----------- drivers/ata/pata_oldpiix.c | 66 +--------- drivers/ata/pata_opti.c | 64 +--------- drivers/ata/pata_optidma.c | 101 ++------------- drivers/ata/pata_pcmcia.c | 64 +-------- drivers/ata/pata_pdc2027x.c | 89 +------------ drivers/ata/pata_pdc202xx_old.c | 96 +++----------- drivers/ata/pata_platform.c | 44 +------ drivers/ata/pata_qdi.c | 63 +-------- drivers/ata/pata_radisys.c | 51 +------- drivers/ata/pata_rb500_cf.c | 44 +------ drivers/ata/pata_rz1000.c | 49 +------- drivers/ata/pata_sc1200.c | 53 +------- drivers/ata/pata_scc.c | 38 +----- drivers/ata/pata_serverworks.c | 104 +++------------ drivers/ata/pata_sil680.c | 63 ++------- drivers/ata/pata_sis.c | 228 ++++---------------------------- drivers/ata/pata_sl82c105.c | 65 ++-------- drivers/ata/pata_triflex.c | 56 +------- drivers/ata/pata_via.c | 130 ++++--------------- drivers/ata/pata_winbond.c | 41 +----- drivers/ata/pdc_adma.c | 50 ++----- drivers/ata/sata_fsl.c | 39 +----- drivers/ata/sata_inic162x.c | 45 +----- drivers/ata/sata_mv.c | 150 ++++----------------- drivers/ata/sata_nv.c | 213 +++++++----------------------- drivers/ata/sata_promise.c | 98 +++----------- drivers/ata/sata_qstor.c | 46 ++----- drivers/ata/sata_sil.c | 41 +------ drivers/ata/sata_sil24.c | 116 +++++++---------- drivers/ata/sata_sis.c | 38 +----- drivers/ata/sata_svw.c | 33 +----- drivers/ata/sata_sx4.c | 17 +-- drivers/ata/sata_uli.c | 43 +------ drivers/ata/sata_via.c | 112 ++-------------- drivers/ata/sata_vsc.c | 34 +----- drivers/scsi/ipr.c | 3 +- include/linux/libata.h | 249 ++++++++++++++++++++++------------- 78 files changed, 1314 insertions(+), 5190 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Auto-merged fs/Kconfig Auto-merged fs/nfs/super.c Merge made by recursive. fs/Kconfig | 70 +++++------ fs/lockd/host.c | 20 ++-- fs/lockd/mon.c | 113 +++++++++++++---- fs/lockd/svc.c | 12 ++ fs/nfs/Makefile | 3 +- fs/nfs/client.c | 16 +++ fs/nfs/dir.c | 2 +- fs/nfs/direct.c | 9 +- fs/nfs/file.c | 6 - fs/nfs/inode.c | 45 +++++++- fs/nfs/internal.h | 13 +-- fs/nfs/nfs2xdr.c | 37 +++++-- fs/nfs/nfs3xdr.c | 37 +++++-- fs/nfs/nfs4proc.c | 18 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/nfs4xdr.c | 39 +++++-- fs/nfs/read.c | 18 +-- fs/nfs/super.c | 130 +++++++++++++------- fs/nfs/unlink.c | 2 +- fs/nfs/write.c | 86 +++++++------ include/linux/lockd/lockd.h | 17 ++-- include/linux/lockd/sm_inter.h | 1 + include/linux/nfs_fs_sb.h | 8 ++ include/linux/sunrpc/auth.h | 13 ++- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/Makefile | 2 +- net/sunrpc/auth.c | 63 ++++++---- net/sunrpc/auth_generic.c | 157 ++++++++++++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 7 +- net/sunrpc/auth_null.c | 1 + net/sunrpc/auth_unix.c | 57 ++++----- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 264 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 37 files changed, 888 insertions(+), 498 deletions(-) create mode 100644 net/sunrpc/auth_generic.c Merging xfs/master $ git merge xfs/master Auto-merged fs/xfs/xfs_iget.c Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_export.c | 11 +- fs/xfs/linux-2.6/xfs_file.c | 13 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 562 +++++++++++++++------------------- fs/xfs/linux-2.6/xfs_iops.c | 180 ++++++------ fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 53 ++-- fs/xfs/linux-2.6/xfs_super.c | 3 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 6 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 4 +- fs/xfs/support/ktrace.c | 37 ++-- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 26 +- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_iget.c | 49 +--- fs/xfs/xfs_inode.c | 661 ++++++++++++++++++++-------------------- fs/xfs/xfs_inode.h | 23 +-- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_inode_item.h | 8 + fs/xfs/xfs_itable.c | 5 +- fs/xfs/xfs_log.c | 61 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 19 +- fs/xfs/xfs_mount.c | 49 ++- fs/xfs/xfs_mount.h | 24 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans.h | 1 - fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 38 +-- fs/xfs/xfs_vnodeops.c | 328 ++++++--------------- fs/xfs/xfs_vnodeops.h | 14 +- 41 files changed, 1042 insertions(+), 1431 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Auto-merged drivers/infiniband/core/uverbs.h Auto-merged drivers/infiniband/core/uverbs_main.c Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c Auto-merged drivers/infiniband/hw/mlx4/main.c Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c Auto-merged drivers/infiniband/ulp/srp/ib_srp.c Auto-merged include/rdma/ib_verbs.h Resolved 'drivers/infiniband/hw/amso1100/c2_provider.c' using previous resolution. Resolved 'drivers/infiniband/hw/cxgb3/iwch_provider.c' using previous resolution. Resolved 'drivers/infiniband/hw/nes/nes_verbs.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. drivers/infiniband/core/addr.c | 8 +- drivers/infiniband/core/cm.c | 65 ++++-- drivers/infiniband/core/cma.c | 20 +- drivers/infiniband/core/ucma.c | 2 +- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_cmd.c | 4 + drivers/infiniband/core/uverbs_main.c | 28 +-- drivers/infiniband/hw/amso1100/c2.c | 80 ++++--- drivers/infiniband/hw/amso1100/c2.h | 16 +- drivers/infiniband/hw/amso1100/c2_ae.c | 10 +- drivers/infiniband/hw/amso1100/c2_alloc.c | 12 +- drivers/infiniband/hw/amso1100/c2_mm.c | 2 +- drivers/infiniband/hw/amso1100/c2_mq.c | 4 +- drivers/infiniband/hw/amso1100/c2_mq.h | 2 +- drivers/infiniband/hw/amso1100/c2_provider.c | 82 +++--- drivers/infiniband/hw/amso1100/c2_qp.c | 24 ++- drivers/infiniband/hw/amso1100/c2_rnic.c | 31 ++-- drivers/infiniband/hw/amso1100/c2_vq.c | 2 +- drivers/infiniband/hw/amso1100/c2_wr.h | 212 ++++++++-------- drivers/infiniband/hw/cxgb3/cxio_dbg.c | 24 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 84 ++++---- drivers/infiniband/hw/cxgb3/cxio_resource.c | 12 +- drivers/infiniband/hw/cxgb3/iwch.c | 6 +- drivers/infiniband/hw/cxgb3/iwch.h | 2 +- drivers/infiniband/hw/cxgb3/iwch_cm.c | 166 +++++++------- drivers/infiniband/hw/cxgb3/iwch_cm.h | 4 +- drivers/infiniband/hw/cxgb3/iwch_cq.c | 4 +- drivers/infiniband/hw/cxgb3/iwch_ev.c | 12 +- drivers/infiniband/hw/cxgb3/iwch_mem.c | 6 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 81 +++--- drivers/infiniband/hw/cxgb3/iwch_provider.h | 4 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 38 ++-- drivers/infiniband/hw/ehca/ehca_av.c | 31 --- drivers/infiniband/hw/ehca/ehca_classes.h | 2 - drivers/infiniband/hw/ehca/ehca_cq.c | 19 -- drivers/infiniband/hw/ehca/ehca_hca.c | 2 +- drivers/infiniband/hw/ehca/ehca_main.c | 19 +- drivers/infiniband/hw/ehca/ehca_mrmw.c | 42 +--- drivers/infiniband/hw/ehca/ehca_pd.c | 11 - drivers/infiniband/hw/ehca/ehca_qp.c | 48 ---- drivers/infiniband/hw/ehca/ehca_tools.h | 16 +- drivers/infiniband/hw/ehca/ehca_uverbs.c | 19 -- drivers/infiniband/hw/ipath/ipath_debug.h | 1 + drivers/infiniband/hw/ipath/ipath_diag.c | 18 +- drivers/infiniband/hw/ipath/ipath_driver.c | 168 +++++++++++-- drivers/infiniband/hw/ipath/ipath_file_ops.c | 9 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 49 ++-- drivers/infiniband/hw/ipath/ipath_iba6120.c | 120 +++++++--- drivers/infiniband/hw/ipath/ipath_init_chip.c | 44 ++-- drivers/infiniband/hw/ipath/ipath_intr.c | 322 +++++++++++++------------ drivers/infiniband/hw/ipath/ipath_kernel.h | 48 ++++- drivers/infiniband/hw/ipath/ipath_mad.c | 101 +++++--- drivers/infiniband/hw/ipath/ipath_qp.c | 40 ++-- drivers/infiniband/hw/ipath/ipath_registers.h | 22 +-- drivers/infiniband/hw/ipath/ipath_srq.c | 3 +- drivers/infiniband/hw/ipath/ipath_sysfs.c | 11 + drivers/infiniband/hw/ipath/ipath_verbs.c | 18 +- drivers/infiniband/hw/mlx4/cq.c | 16 ++ drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 16 +- drivers/infiniband/hw/mlx4/qp.c | 7 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 6 +- drivers/infiniband/hw/mthca/mthca_cmd.h | 1 + drivers/infiniband/hw/mthca/mthca_cq.c | 14 +- drivers/infiniband/hw/mthca/mthca_dev.h | 10 +- drivers/infiniband/hw/mthca/mthca_eq.c | 4 +- drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- drivers/infiniband/hw/mthca/mthca_main.c | 15 +- drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- drivers/infiniband/hw/mthca/mthca_profile.c | 4 +- drivers/infiniband/hw/mthca/mthca_profile.h | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- drivers/infiniband/hw/mthca/mthca_qp.c | 2 + drivers/infiniband/hw/mthca/mthca_wqe.h | 16 +- drivers/infiniband/hw/nes/nes.c | 11 +- drivers/infiniband/hw/nes/nes.h | 32 +--- drivers/infiniband/hw/nes/nes_cm.c | 123 ++++++---- drivers/infiniband/hw/nes/nes_cm.h | 35 --- drivers/infiniband/hw/nes/nes_hw.c | 49 +++-- drivers/infiniband/hw/nes/nes_nic.c | 26 +-- drivers/infiniband/hw/nes/nes_utils.c | 2 +- drivers/infiniband/hw/nes/nes_verbs.c | 26 +- drivers/infiniband/ulp/ipoib/ipoib.h | 1 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 + drivers/infiniband/ulp/ipoib/ipoib_main.c | 24 ++- drivers/infiniband/ulp/srp/ib_srp.c | 7 +- drivers/net/mlx4/catas.c | 2 +- drivers/net/mlx4/cmd.c | 3 +- drivers/net/mlx4/eq.c | 5 +- drivers/net/mlx4/fw.c | 4 + drivers/net/mlx4/intf.c | 8 +- drivers/net/mlx4/mlx4.h | 4 +- include/linux/mlx4/cq.h | 14 +- include/linux/mlx4/driver.h | 3 +- include/linux/mlx4/qp.h | 10 +- include/rdma/ib_user_verbs.h | 4 + include/rdma/ib_verbs.h | 11 +- 98 files changed, 1477 insertions(+), 1303 deletions(-) Merging acpi/test $ git merge acpi/test Removed arch/x86/kernel/acpi/sleep_32.c Removed kernel/power/pm.c Merge made by recursive. arch/frv/kernel/pm.c | 8 - arch/mips/au1000/common/power.c | 35 +--- arch/x86/Kconfig | 2 +- arch/x86/boot/Makefile | 2 +- arch/x86/boot/boot.h | 5 + arch/x86/boot/video-bios.c | 6 + arch/x86/boot/video-mode.c | 173 +++++++++++++++ arch/x86/boot/video-vesa.c | 8 + arch/x86/boot/video-vga.c | 12 +- arch/x86/boot/video.c | 157 +-------------- arch/x86/kernel/acpi/Makefile | 8 +- arch/x86/kernel/acpi/realmode/Makefile | 57 +++++ arch/x86/kernel/acpi/realmode/copy.S | 1 + arch/x86/kernel/acpi/realmode/video-bios.c | 1 + arch/x86/kernel/acpi/realmode/video-mode.c | 1 + arch/x86/kernel/acpi/realmode/video-vesa.c | 1 + arch/x86/kernel/acpi/realmode/video-vga.c | 1 + arch/x86/kernel/acpi/realmode/wakemain.c | 81 +++++++ arch/x86/kernel/acpi/realmode/wakeup.S | 113 ++++++++++ arch/x86/kernel/acpi/realmode/wakeup.h | 36 ++++ arch/x86/kernel/acpi/realmode/wakeup.lds.S | 61 ++++++ arch/x86/kernel/acpi/sleep.c | 73 ++++++-- arch/x86/kernel/acpi/sleep.h | 18 ++ arch/x86/kernel/acpi/sleep_32.c | 40 ---- arch/x86/kernel/acpi/wakeup_32.S | 247 ++-------------------- arch/x86/kernel/acpi/wakeup_64.S | 313 +--------------------------- arch/x86/kernel/acpi/wakeup_rm.S | 10 + arch/x86/kernel/apm_32.c | 15 -- arch/x86/kernel/e820_64.c | 5 +- arch/x86/kernel/head_64.S | 4 - arch/x86/kernel/setup_32.c | 4 +- arch/x86/kernel/setup_64.c | 16 ++ arch/x86/kernel/smpboot_64.c | 26 +-- drivers/acpi/ec.c | 240 +++++++++++---------- drivers/acpi/events/evgpe.c | 3 +- drivers/acpi/glue.c | 20 ++ drivers/acpi/sbshc.c | 1 - drivers/acpi/utilities/utxface.c | 36 ++-- include/asm-x86/smp_64.h | 2 - include/asm-x86/trampoline.h | 18 ++ kernel/power/Kconfig | 10 - kernel/power/Makefile | 1 - kernel/power/pm.c | 205 ------------------ 43 files changed, 891 insertions(+), 1185 deletions(-) create mode 100644 arch/x86/boot/video-mode.c create mode 100644 arch/x86/kernel/acpi/realmode/Makefile create mode 100644 arch/x86/kernel/acpi/realmode/copy.S create mode 100644 arch/x86/kernel/acpi/realmode/video-bios.c create mode 100644 arch/x86/kernel/acpi/realmode/video-mode.c create mode 100644 arch/x86/kernel/acpi/realmode/video-vesa.c create mode 100644 arch/x86/kernel/acpi/realmode/video-vga.c create mode 100644 arch/x86/kernel/acpi/realmode/wakemain.c create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.S create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.h create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.lds.S create mode 100644 arch/x86/kernel/acpi/sleep.h delete mode 100644 arch/x86/kernel/acpi/sleep_32.c create mode 100644 arch/x86/kernel/acpi/wakeup_rm.S create mode 100644 include/asm-x86/trampoline.h delete mode 100644 kernel/power/pm.c Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged fs/Kconfig Auto-merged fs/lockd/host.c Auto-merged fs/lockd/svc.c Auto-merged net/sunrpc/svc_xprt.c Auto-merged net/sunrpc/xprtrdma/svc_rdma_transport.c Merge made by recursive. Documentation/filesystems/nfs-rdma.txt | 252 ++++++++++++++++++++++++++++++ fs/Kconfig | 94 ++++++----- fs/lockd/host.c | 73 +++++----- fs/lockd/svc.c | 132 +++++++--------- fs/lockd/svclock.c | 3 +- fs/lockd/svcshare.c | 3 +- fs/nfs/callback.c | 73 ++++----- fs/nfs/symlink.c | 1 - fs/nfsd/auth.c | 1 + fs/nfsd/export.c | 9 +- fs/nfsd/nfs4idmap.c | 2 +- fs/nfsd/nfs4state.c | 71 +++++---- fs/nfsd/nfs4xdr.c | 13 ++- fs/nfsd/nfsctl.c | 22 ++- fs/nfsd/nfssvc.c | 2 - fs/nfsd/vfs.c | 4 +- include/linux/nfs3.h | 2 +- include/linux/nfsd/nfsd.h | 8 + include/linux/sunrpc/cache.h | 1 - include/linux/sunrpc/gss_krb5.h | 2 - include/linux/sunrpc/svcauth.h | 5 +- include/net/ipv6.h | 9 + net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 3 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- net/sunrpc/auth_gss/svcauth_gss.c | 9 +- net/sunrpc/cache.c | 1 - net/sunrpc/svc.c | 5 +- net/sunrpc/svc_xprt.c | 30 +++- net/sunrpc/svcauth_unix.c | 118 ++++++++++----- net/sunrpc/svcsock.c | 1 + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 + 32 files changed, 653 insertions(+), 308 deletions(-) create mode 100644 Documentation/filesystems/nfs-rdma.txt Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 13 +- drivers/firewire/Kconfig | 5 + drivers/firewire/fw-card.c | 40 +---- drivers/firewire/fw-cdev.c | 13 +- drivers/firewire/fw-device.c | 263 ++++++++++++++++++++----- drivers/firewire/fw-device.h | 38 +++- drivers/firewire/fw-ohci.c | 320 ++++++++++++++++++++++++------ drivers/firewire/fw-ohci.h | 1 + drivers/firewire/fw-sbp2.c | 150 +++++++-------- drivers/firewire/fw-topology.c | 15 ++ drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 62 +++--- drivers/firewire/fw-transaction.h | 6 - drivers/ieee1394/csr.c | 6 +- drivers/ieee1394/dv1394.c | 3 +- drivers/ieee1394/highlevel.c | 6 +- drivers/ieee1394/ieee1394_core.c | 2 +- drivers/ieee1394/nodemgr.c | 6 +- drivers/ieee1394/ohci1394.c | 117 +++++------ drivers/ieee1394/pcilynx.c | 15 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 + 24 files changed, 733 insertions(+), 384 deletions(-) Merging hwmon/testing $ git merge hwmon/testing Merge made by recursive. Documentation/hwmon/w83l785ts | 3 +- drivers/hwmon/adm1026.c | 22 ++++++--- drivers/hwmon/adm1029.c | 30 ++++++++----- drivers/hwmon/adm1031.c | 20 ++++++-- drivers/hwmon/adm9240.c | 20 ++++++--- drivers/hwmon/adt7470.c | 40 ++++++++++------- drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ drivers/hwmon/asb100.c | 20 +++++--- drivers/hwmon/dme1737.c | 5 ++ drivers/hwmon/f71805f.c | 5 ++ drivers/hwmon/f71882fg.c | 5 ++ drivers/hwmon/it87.c | 5 ++ drivers/hwmon/lm75.c | 5 +-- drivers/hwmon/pc87360.c | 6 +++ drivers/hwmon/pc87427.c | 5 ++ drivers/hwmon/sis5595.c | 5 ++ drivers/hwmon/smsc47b397.c | 22 ++++++++- drivers/hwmon/smsc47m1.c | 5 ++ drivers/hwmon/via686a.c | 5 ++ drivers/hwmon/vt1211.c | 5 ++ drivers/hwmon/vt8231.c | 5 ++ drivers/hwmon/w83627ehf.c | 6 +++ drivers/hwmon/w83627hf.c | 5 ++ drivers/hwmon/w83793.c | 26 ++++++----- drivers/hwmon/w83l785ts.c | 4 +- 25 files changed, 257 insertions(+), 121 deletions(-) Merging ubi/master $ git merge ubi/master Merge made by recursive. Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ drivers/mtd/ubi/build.c | 18 +- drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/io.c | 4 + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- drivers/mtd/ubi/ubi.h | 3 +- include/mtd/Kbuild | 1 - 7 files changed, 231 insertions(+), 17 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-ubi rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) Merging kvm/master $ git merge kvm/master Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/reboot.c Auto-merged arch/x86/kernel/setup_32.c Auto-merged arch/x86/kernel/setup_64.c Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 18 + arch/x86/kernel/Makefile | 2 + arch/x86/kernel/crash.c | 3 +- arch/x86/kernel/kvm.c | 247 ++++++++++++ arch/x86/kernel/kvmclock.c | 187 +++++++++ arch/x86/kernel/reboot.c | 13 +- arch/x86/kernel/setup_32.c | 6 + arch/x86/kernel/setup_64.c | 7 + arch/x86/kvm/Kconfig | 2 +- arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c | 600 ++++++++++++++++++++++++++++ arch/x86/kvm/i8254.h | 62 +++ arch/x86/kvm/irq.c | 3 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 8 +- arch/x86/kvm/mmu.c | 579 +++++++++++++++++++++++---- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 70 ++-- arch/x86/kvm/segment_descriptor.h | 29 -- arch/x86/kvm/svm.c | 250 +++++++++--- arch/x86/kvm/svm.h | 3 + arch/x86/kvm/tss.h | 59 +++ arch/x86/kvm/vmx.c | 177 +++++++-- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 796 +++++++++++++++++++++++++++++++++---- arch/x86/kvm/x86_emulate.c | 256 +++++++------ include/asm-x86/kvm.h | 21 + include/asm-x86/kvm_host.h | 70 +++- include/asm-x86/kvm_para.h | 55 +++ include/asm-x86/reboot.h | 2 + include/linux/kvm.h | 10 + include/linux/kvm_host.h | 23 +- include/linux/kvm_para.h | 11 +- virt/kvm/kvm_main.c | 96 ++++- 34 files changed, 3219 insertions(+), 467 deletions(-) create mode 100644 arch/x86/kernel/kvm.c create mode 100644 arch/x86/kernel/kvmclock.c create mode 100644 arch/x86/kvm/i8254.c create mode 100644 arch/x86/kvm/i8254.h delete mode 100644 arch/x86/kvm/segment_descriptor.h create mode 100644 arch/x86/kvm/tss.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/config.c | 2 +- fs/dlm/lock.c | 5 ++--- fs/dlm/lock.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merged drivers/base/transport_class.c Auto-merged drivers/message/fusion/mptscsih.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/3w-xxxx.c Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/raid_class.c Removed drivers/scsi/scsi_debug.h 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/scsi/st.txt | 12 +- arch/ia64/hp/sim/simscsi.c | 23 +- drivers/base/transport_class.c | 2 +- drivers/message/fusion/mptbase.c | 27 +- drivers/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptscsih.c | 8 +- drivers/s390/scsi/zfcp_def.h | 1 - drivers/s390/scsi/zfcp_fsf.c | 7 + drivers/s390/scsi/zfcp_scsi.c | 64 +-- drivers/scsi/3w-9xxx.c | 21 +- drivers/scsi/3w-xxxx.c | 12 +- drivers/scsi/BusLogic.c | 5 +- drivers/scsi/BusLogic.h | 21 +- drivers/scsi/FlashPoint.c | 6 +- drivers/scsi/Kconfig | 14 +- drivers/scsi/aacraid/aachba.c | 67 ++-- drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +- drivers/scsi/aic94xx/aic94xx.h | 16 - drivers/scsi/aic94xx/aic94xx_hwi.c | 20 +- drivers/scsi/aic94xx/aic94xx_init.c | 2 - drivers/scsi/arm/acornscsi.c | 1 - drivers/scsi/arm/cumana_1.c | 1 - drivers/scsi/dc395x.c | 1 - drivers/scsi/eata_pio.c | 2 - drivers/scsi/gdth.c | 320 ++++++--------- drivers/scsi/gdth.h | 2 - drivers/scsi/hptiop.c | 1 - drivers/scsi/ips.c | 49 +-- drivers/scsi/libsas/sas_scsi_host.c | 41 ++ drivers/scsi/mac_scsi.c | 1 - drivers/scsi/ps3rom.c | 94 +---- drivers/scsi/qla4xxx/ql4_fw.h | 1 + drivers/scsi/qla4xxx/ql4_glbl.h | 2 + drivers/scsi/qla4xxx/ql4_mbx.c | 39 ++ drivers/scsi/qla4xxx/ql4_os.c | 82 +++- drivers/scsi/raid_class.c | 2 +- drivers/scsi/scsi.c | 227 ++++++++--- drivers/scsi/scsi_debug.c | 755 +++++++++++++++-------------------- drivers/scsi/scsi_debug.h | 24 -- drivers/scsi/scsi_error.c | 122 +++++- drivers/scsi/st.c | 83 ++++- drivers/scsi/st.h | 3 + drivers/scsi/st_options.h | 6 +- drivers/scsi/stex.c | 66 +--- include/linux/attribute_container.h | 2 +- include/linux/mtio.h | 1 + include/linux/scatterlist.h | 5 + include/linux/transport_class.h | 4 +- include/scsi/libsas.h | 2 + include/scsi/scsi_cmnd.h | 17 + include/scsi/scsi_eh.h | 1 + include/scsi/scsi_host.h | 1 + lib/scatterlist.c | 102 +++++ 54 files changed, 1259 insertions(+), 1150 deletions(-) delete mode 100644 drivers/scsi/scsi_debug.h $ git revert a2aa351f271fa4eb6b5af304c922d25dc764e438 Finished one revert. Created commit 3777e32: Revert "driver core: remove no longer used "struct class_device"" 3 files changed, 745 insertions(+), 1 deletions(-) Merging ia64/test $ git merge ia64/test Merge made by recursive. arch/ia64/Kconfig | 11 + arch/ia64/ia32/elfcore32.h | 14 +- arch/ia64/ia32/sys_ia32.c | 649 ++++++++++++++++++++- arch/ia64/kernel/asm-offsets.c | 6 + arch/ia64/kernel/entry.S | 65 +++ arch/ia64/kernel/fsys.S | 54 ++- arch/ia64/kernel/head.S | 20 + arch/ia64/kernel/ivt.S | 69 +++ arch/ia64/kernel/minstate.h | 14 + arch/ia64/kernel/patch.c | 8 +- arch/ia64/kernel/process.c | 30 - arch/ia64/kernel/ptrace.c | 1217 +++++++++++++++++++++++++++++----------- arch/ia64/kernel/time.c | 78 +++ include/asm-ia64/cputime.h | 104 ++++ include/asm-ia64/elf.h | 31 +- include/asm-ia64/system.h | 12 + include/asm-ia64/thread_info.h | 14 + 17 files changed, 1992 insertions(+), 404 deletions(-) Merging tests/master $ git merge tests/master Auto-merged Makefile Auto-merged drivers/misc/Makefile Auto-merged lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Resolved 'lib/Kconfig.debug' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Makefile | 1 + drivers/misc/Makefile | 1 - kernel/Makefile | 4 - lib/Kconfig.debug | 72 +-------------------- lib/Makefile | 1 - tests/Kconfig | 80 +++++++++++++++++++++++ tests/Makefile | 10 +++ {kernel => tests}/backtracetest.c | 0 {drivers/misc => tests}/lkdtm.c | 12 ++-- {lib => tests}/locking-selftest-hardirq.h | 0 {lib => tests}/locking-selftest-mutex.h | 0 {lib => tests}/locking-selftest-rlock-hardirq.h | 0 {lib => tests}/locking-selftest-rlock-softirq.h | 0 {lib => tests}/locking-selftest-rlock.h | 0 {lib => tests}/locking-selftest-rsem.h | 0 {lib => tests}/locking-selftest-softirq.h | 0 {lib => tests}/locking-selftest-spin-hardirq.h | 0 {lib => tests}/locking-selftest-spin-softirq.h | 0 {lib => tests}/locking-selftest-spin.h | 0 {lib => tests}/locking-selftest-wlock-hardirq.h | 0 {lib => tests}/locking-selftest-wlock-softirq.h | 0 {lib => tests}/locking-selftest-wlock.h | 0 {lib => tests}/locking-selftest-wsem.h | 0 {lib => tests}/locking-selftest.c | 0 {kernel => tests}/rcutorture.c | 0 {kernel => tests}/rtmutex-tester.c | 2 +- {kernel => tests}/test_kprobes.c | 0 27 files changed, 100 insertions(+), 83 deletions(-) create mode 100644 tests/Kconfig create mode 100644 tests/Makefile rename {kernel => tests}/backtracetest.c (100%) rename {drivers/misc => tests}/lkdtm.c (96%) rename {lib => tests}/locking-selftest-hardirq.h (100%) rename {lib => tests}/locking-selftest-mutex.h (100%) rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) rename {lib => tests}/locking-selftest-rlock.h (100%) rename {lib => tests}/locking-selftest-rsem.h (100%) rename {lib => tests}/locking-selftest-softirq.h (100%) rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) rename {lib => tests}/locking-selftest-spin-softirq.h (100%) rename {lib => tests}/locking-selftest-spin.h (100%) rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) rename {lib => tests}/locking-selftest-wlock.h (100%) rename {lib => tests}/locking-selftest-wsem.h (100%) rename {lib => tests}/locking-selftest.c (100%) rename {kernel => tests}/rcutorture.c (100%) rename {kernel => tests}/rtmutex-tester.c (99%) rename {kernel => tests}/test_kprobes.c (100%) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merged MAINTAINERS Auto-merged fs/Kconfig Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 11 + MAINTAINERS | 1 + fs/Kconfig | 26 + fs/ocfs2/Makefile | 14 +- fs/ocfs2/alloc.c | 465 +++++++++++++-- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 51 ++- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dlm/dlmcommon.h | 49 ++ fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- fs/ocfs2/dlm/dlmdebug.h | 86 +++ fs/ocfs2/dlm/dlmdomain.c | 70 ++- fs/ocfs2/dlm/dlmlock.c | 22 +- fs/ocfs2/dlm/dlmmaster.c | 200 ++----- fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- fs/ocfs2/dlmglue.h | 5 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/heartbeat.c | 184 +------ fs/ocfs2/heartbeat.h | 17 +- fs/ocfs2/ioctl.c | 13 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/journal.c | 211 ++++++- fs/ocfs2/journal.h | 4 + fs/ocfs2/localalloc.c | 4 + fs/ocfs2/namei.c | 4 +- fs/ocfs2/ocfs2.h | 77 ++- fs/ocfs2/ocfs2_fs.h | 79 +++- fs/ocfs2/ocfs2_lockid.h | 2 +- fs/ocfs2/slot_map.c | 454 +++++++++++--- fs/ocfs2/slot_map.h | 32 +- fs/ocfs2/stack_o2cb.c | 420 +++++++++++++ fs/ocfs2/stack_user.c | 883 +++++++++++++++++++++++++++ fs/ocfs2/stackglue.c | 568 +++++++++++++++++ fs/ocfs2/stackglue.h | 261 ++++++++ fs/ocfs2/suballoc.c | 103 +++- fs/ocfs2/suballoc.h | 1 + fs/ocfs2/super.c | 208 ++++--- fs/sysfs/symlink.c | 9 +- 40 files changed, 5120 insertions(+), 1009 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb create mode 100644 fs/ocfs2/dlm/dlmdebug.h create mode 100644 fs/ocfs2/stack_o2cb.c create mode 100644 fs/ocfs2/stack_user.c create mode 100644 fs/ocfs2/stackglue.c create mode 100644 fs/ocfs2/stackglue.h Merging selinux/for-akpm $ git merge selinux/for-akpm Auto-merged security/commoncap.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c Auto-merged security/selinux/include/security.h Merge made by recursive. security/commoncap.c | 4 +- security/keys/internal.h | 8 +- security/root_plug.c | 2 +- security/security.c | 8 +- security/selinux/avc.c | 4 +- security/selinux/hooks.c | 64 ++++++++++++++------ security/selinux/include/av_perm_to_string.h | 5 ++ security/selinux/include/av_permissions.h | 5 ++ security/selinux/include/netlabel.h | 16 ----- security/selinux/include/objsec.h | 8 --- security/selinux/include/security.h | 2 + security/selinux/netlabel.c | 82 +++++--------------------- security/selinux/netlink.c | 2 +- security/selinux/selinuxfs.c | 11 ++-- security/selinux/ss/avtab.c | 40 ++++++------ security/selinux/ss/conditional.c | 16 +++--- security/selinux/ss/ebitmap.c | 14 ++-- security/selinux/ss/policydb.c | 54 +++++++++--------- security/selinux/ss/services.c | 35 ++++++----- 19 files changed, 174 insertions(+), 206 deletions(-) Merging quilt/m68k $ git merge quilt/m68k Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging powerpc/powerpc-next $ git merge powerpc/powerpc-next Auto-merged arch/powerpc/platforms/powermac/setup.c Auto-merged lib/Makefile Merge made by recursive. Documentation/powerpc/phyp-assisted-dump.txt | 127 +++++++ arch/powerpc/Kconfig | 11 + arch/powerpc/configs/maple_defconfig | 131 +++++++- arch/powerpc/kernel/asm-offsets.c | 4 - arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 - arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/ppc_ksyms.c | 2 +- arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/prom.c | 59 +++- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 11 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 5 - arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 26 ++- arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/mm/init_64.c | 2 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/iseries/pci.c | 3 +- arch/powerpc/platforms/maple/pci.c | 47 --- arch/powerpc/platforms/maple/setup.c | 4 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/lpar.c | 15 + arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++++++++++++++++ arch/powerpc/platforms/pseries/scanlog.c | 37 +- arch/powerpc/platforms/pseries/setup.c | 4 + arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 +- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/kernel/head.S | 17 - arch/sparc64/Kconfig | 1 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 ++++++++++++++--- drivers/net/pasemi_mac.h | 35 ++- drivers/net/pasemi_mac_ethtool.c | 159 ++++++++ include/asm-powerpc/Kbuild | 2 +- include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/lmb.h | 82 +---- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 ++++- include/asm-powerpc/phyp_dump.h | 45 +++ include/asm-powerpc/sparsemem.h | 1 + include/asm-sparc64/lmb.h | 10 + include/linux/lmb.h | 83 +++++ lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 ++++---- 62 files changed, 1867 insertions(+), 368 deletions(-) create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-powerpc/phyp_dump.h create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) Merging hrt/mm $ git merge hrt/mm Auto-merged Documentation/00-INDEX Merge made by recursive. Documentation/00-INDEX | 6 +-- Documentation/{hrtimers => timers}/highres.txt | 0 Documentation/{hrtimers => timers}/hrtimers.txt | 0 Documentation/{hrtimer => timers}/timer_stats.txt | 0 include/linux/hrtimer.h | 2 - include/linux/interrupt.h | 19 +++++++++ include/linux/irq.h | 10 ----- include/linux/sched.h | 6 +++ include/linux/spinlock.h | 37 ------------------ include/linux/thread_info.h | 12 ++++++ kernel/compat.c | 15 +++---- kernel/hrtimer.c | 22 +++++------ kernel/posix-cpu-timers.c | 30 +++++++------- kernel/sched.c | 42 +++++++++++++++++++++ kernel/time/clocksource.c | 20 +++++++-- kernel/time/tick-broadcast.c | 2 +- kernel/time/tick-common.c | 4 +- kernel/time/tick-oneshot.c | 2 +- kernel/time/tick-sched.c | 6 +-- kernel/timer.c | 26 ++++++------ kernel/workqueue.c | 2 + 21 files changed, 150 insertions(+), 113 deletions(-) rename Documentation/{hrtimers => timers}/highres.txt (100%) rename Documentation/{hrtimers => timers}/hrtimers.txt (100%) rename Documentation/{hrtimer => timers}/timer_stats.txt (100%) $ git revert c3568e265a3984f1b413c615bb9132546bc19c76 Auto-merged kernel/timer.c Finished one revert. Created commit 98e8bcb: Revert "NOHZ: reevaluate idle sleep length after add_timer_on()" 3 files changed, 1 insertions(+), 57 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging ext4/next $ git merge ext4/next Merge made by recursive. fs/ext4/balloc.c | 29 +++++-- fs/ext4/dir.c | 2 +- fs/ext4/extents.c | 203 +++++++++++++++++++++++++++++++++++++++++--- fs/ext4/file.c | 21 ++++- fs/ext4/fsync.c | 3 + fs/ext4/ialloc.c | 112 ++++++++++++++++++++++-- fs/ext4/inode.c | 35 ++++---- fs/ext4/ioctl.c | 12 +-- fs/ext4/mballoc.c | 63 ++++++-------- fs/ext4/namei.c | 11 ++- fs/ext4/resize.c | 6 +- fs/ext4/super.c | 63 +++++++++++++- fs/ext4/xattr.c | 16 ++-- fs/ext4/xattr.h | 7 -- fs/jbd2/commit.c | 19 +---- fs/jbd2/journal.c | 13 ++-- fs/jbd2/revoke.c | 4 +- fs/jbd2/transaction.c | 34 +++++++- include/linux/ext4_fs.h | 29 ++++++- include/linux/ext4_fs_sb.h | 3 + 20 files changed, 534 insertions(+), 151 deletions(-) Merging 4xx/next $ git merge 4xx/next Auto-merged arch/powerpc/boot/Makefile Auto-merged arch/powerpc/boot/cuboot-taishan.c Auto-merged arch/powerpc/boot/cuboot-warp.c Merge made by recursive. Documentation/powerpc/booting-without-of.txt | 16 - arch/powerpc/boot/Makefile | 3 +- arch/powerpc/boot/bamboo.c | 3 +- arch/powerpc/boot/cuboot-rainier.c | 3 +- arch/powerpc/boot/cuboot-sequoia.c | 3 +- arch/powerpc/boot/cuboot-taishan.c | 3 +- arch/powerpc/boot/cuboot-warp.c | 2 +- arch/powerpc/boot/cuboot-yosemite.c | 44 ++ arch/powerpc/boot/dts/bamboo.dts | 2 - arch/powerpc/boot/dts/canyonlands.dts | 391 ++++++++++++++ arch/powerpc/boot/dts/ebony.dts | 2 - arch/powerpc/boot/dts/rainier.dts | 2 - arch/powerpc/boot/dts/sequoia.dts | 2 - arch/powerpc/boot/dts/taishan.dts | 4 - arch/powerpc/boot/dts/walnut.dts | 1 - arch/powerpc/boot/dts/warp.dts | 1 - arch/powerpc/boot/dts/yosemite.dts | 304 +++++++++++ arch/powerpc/boot/ebony.c | 3 +- arch/powerpc/boot/treeboot-walnut.c | 2 +- arch/powerpc/configs/canyonlands_defconfig | 721 ++++++++++++++++++++++++++ arch/powerpc/kernel/cpu_setup_44x.S | 5 +- arch/powerpc/kernel/cputable.c | 28 +- arch/powerpc/platforms/44x/Kconfig | 27 + arch/powerpc/platforms/44x/Makefile | 2 + arch/powerpc/platforms/44x/canyonlands.c | 64 +++ arch/powerpc/sysdev/ppc4xx_pci.c | 114 ++++ arch/powerpc/sysdev/ppc4xx_pci.h | 59 +++ 27 files changed, 1771 insertions(+), 40 deletions(-) create mode 100644 arch/powerpc/boot/cuboot-yosemite.c create mode 100644 arch/powerpc/boot/dts/canyonlands.dts create mode 100644 arch/powerpc/boot/dts/yosemite.dts create mode 100644 arch/powerpc/configs/canyonlands_defconfig create mode 100644 arch/powerpc/platforms/44x/canyonlands.c Merging async_tx/next $ git merge async_tx/next Merge made by recursive. crypto/async_tx/async_memcpy.c | 2 +- crypto/async_tx/async_tx.c | 202 ++++++++++++++++++++++++++------ crypto/async_tx/async_xor.c | 2 +- drivers/dma/dmaengine.c | 15 +-- drivers/dma/fsldma.c | 18 +-- drivers/dma/ioat_dma.c | 36 ++---- drivers/dma/iop-adma.c | 60 ++++------ include/asm-arm/arch-iop13xx/adma.h | 5 - include/asm-arm/hardware/iop3xx-adma.h | 8 -- include/asm-arm/hardware/iop_adma.h | 2 - include/linux/dmaengine.h | 36 ++++--- 11 files changed, 237 insertions(+), 149 deletions(-) Merging udf/for_next $ git merge udf/for_next Auto-merged include/linux/Kbuild Removed include/linux/udf_fs.h Removed include/linux/udf_fs_sb.h Merge made by recursive. fs/udf/balloc.c | 13 +- fs/udf/crc.c | 4 +- fs/udf/dir.c | 83 ++---- fs/udf/ecma_167.h | 13 - fs/udf/file.c | 47 --- fs/udf/ialloc.c | 13 +- fs/udf/inode.c | 187 +++--------- fs/udf/lowlevel.c | 1 - fs/udf/misc.c | 1 - fs/udf/namei.c | 197 +++++--------- fs/udf/partition.c | 1 - fs/udf/super.c | 697 +++++++++++++++++++-------------------------- fs/udf/symlink.c | 1 - fs/udf/truncate.c | 81 ++---- fs/udf/udf_i.h | 30 ++- fs/udf/udf_sb.h | 93 ++++++ fs/udf/udfdecl.h | 64 +++-- fs/udf/udfend.h | 22 -- fs/udf/udftime.c | 35 ++-- fs/udf/unicode.c | 59 ++--- include/linux/Kbuild | 2 +- include/linux/udf_fs.h | 51 ---- include/linux/udf_fs_i.h | 31 -- include/linux/udf_fs_sb.h | 117 -------- 24 files changed, 682 insertions(+), 1161 deletions(-) delete mode 100644 include/linux/udf_fs.h delete mode 100644 include/linux/udf_fs_sb.h Merging security-testing/next $ git merge security-testing/next Auto-merged Documentation/kernel-parameters.txt Auto-merged include/linux/security.h Auto-merged kernel/audit.c Auto-merged security/dummy.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c Auto-merged security/selinux/ss/services.c Auto-merged security/smack/smack.h Auto-merged security/smack/smack_lsm.c Auto-merged security/smack/smackfs.c Merge made by recursive. Documentation/kernel-parameters.txt | 6 ++ include/linux/audit.h | 29 ++++++++ include/linux/security.h | 114 +++++++++++++++++++++++++++++- include/linux/selinux.h | 134 ----------------------------------- kernel/audit.c | 24 +++---- kernel/audit.h | 25 ------- kernel/auditfilter.c | 99 ++++++++++---------------- kernel/auditsc.c | 74 ++++++++++--------- net/netlink/af_netlink.c | 3 +- security/dummy.c | 51 +++++++++++++- security/security.c | 73 +++++++++++++++++++- security/selinux/exports.c | 42 ----------- security/selinux/hooks.c | 34 ++++++++- security/selinux/include/audit.h | 65 +++++++++++++++++ security/selinux/ss/services.c | 45 +++++++++--- security/smack/smack.h | 2 + security/smack/smack_lsm.c | 7 ++- security/smack/smackfs.c | 11 +++- 18 files changed, 503 insertions(+), 335 deletions(-) create mode 100644 security/selinux/include/audit.h Merging net/master $ git merge net/master Auto-merged Documentation/feature-removal-schedule.txt Removed Documentation/networking/bcm43xx.txt Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged arch/s390/defconfig Auto-merged drivers/net/Makefile Removed drivers/net/atl1/Makefile Removed drivers/net/atl1/atl1.h Removed drivers/net/atl1/atl1_ethtool.c Removed drivers/net/atl1/atl1_hw.c Removed drivers/net/atl1/atl1_hw.h Removed drivers/net/atl1/atl1_param.c Removed drivers/net/sk98lin/Makefile Removed drivers/net/sk98lin/h/lm80.h Removed drivers/net/sk98lin/h/skaddr.h Removed drivers/net/sk98lin/h/skcsum.h Removed drivers/net/sk98lin/h/skdebug.h Removed drivers/net/sk98lin/h/skdrv1st.h Removed drivers/net/sk98lin/h/skdrv2nd.h Removed drivers/net/sk98lin/h/skerror.h Removed drivers/net/sk98lin/h/skgedrv.h Removed drivers/net/sk98lin/h/skgehw.h Removed drivers/net/sk98lin/h/skgehwt.h Removed drivers/net/sk98lin/h/skgei2c.h Removed drivers/net/sk98lin/h/skgeinit.h Removed drivers/net/sk98lin/h/skgepnm2.h Removed drivers/net/sk98lin/h/skgepnmi.h Removed drivers/net/sk98lin/h/skgesirq.h Removed drivers/net/sk98lin/h/ski2c.h Removed drivers/net/sk98lin/h/skqueue.h Removed drivers/net/sk98lin/h/skrlmt.h Removed drivers/net/sk98lin/h/sktimer.h Removed drivers/net/sk98lin/h/sktypes.h Removed drivers/net/sk98lin/h/skversion.h Removed drivers/net/sk98lin/h/skvpd.h Removed drivers/net/sk98lin/h/xmac_ii.h Removed drivers/net/sk98lin/skaddr.c Removed drivers/net/sk98lin/skdim.c Removed drivers/net/sk98lin/skethtool.c Removed drivers/net/sk98lin/skge.c Removed drivers/net/sk98lin/skgehwt.c Removed drivers/net/sk98lin/skgeinit.c Removed drivers/net/sk98lin/skgemib.c Removed drivers/net/sk98lin/skgepnmi.c Removed drivers/net/sk98lin/skgesirq.c Removed drivers/net/sk98lin/ski2c.c Removed drivers/net/sk98lin/sklm80.c Removed drivers/net/sk98lin/skqueue.c Removed drivers/net/sk98lin/skrlmt.c Removed drivers/net/sk98lin/sktimer.c Removed drivers/net/sk98lin/skvpd.c Removed drivers/net/sk98lin/skxmac2.c Removed drivers/net/tulip/xircom_tulip_cb.c Removed drivers/net/wireless/bcm43xx/Kconfig Removed drivers/net/wireless/bcm43xx/Makefile Removed drivers/net/wireless/bcm43xx/bcm43xx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h Removed drivers/net/wireless/rt2x00/rt2x00ring.h Removed drivers/s390/net/ctcdbug.c Removed drivers/s390/net/ctcdbug.h Removed drivers/s390/net/ctcmain.c Removed drivers/s390/net/ctcmain.h Removed drivers/s390/net/qeth_fs.h Removed drivers/s390/net/qeth_main.c Removed drivers/s390/net/qeth_mpc.c Removed drivers/s390/net/qeth_proc.c Removed drivers/s390/net/qeth_sys.c Removed drivers/s390/net/qeth_tso.h Removed include/net/ieee80211softmac.h Removed include/net/ieee80211softmac_wx.h Auto-merged include/net/ipv6.h Auto-merged net/core/sock.c Removed net/ieee80211/softmac/Kconfig Removed net/ieee80211/softmac/Makefile Removed net/ieee80211/softmac/ieee80211softmac_assoc.c Removed net/ieee80211/softmac/ieee80211softmac_auth.c Removed net/ieee80211/softmac/ieee80211softmac_event.c Removed net/ieee80211/softmac/ieee80211softmac_io.c Removed net/ieee80211/softmac/ieee80211softmac_module.c Removed net/ieee80211/softmac/ieee80211softmac_priv.h Removed net/ieee80211/softmac/ieee80211softmac_scan.c Removed net/ieee80211/softmac/ieee80211softmac_wx.c Removed net/mac80211/rc80211_simple.c Removed net/mac80211/regdomain.c Auto-merged net/netlink/af_netlink.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/clnt.c Auto-merged net/sunrpc/rpcb_clnt.c Auto-merged net/sunrpc/xprtsock.c Resolved 'MAINTAINERS' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/Makefile | 3 +- Documentation/DocBook/mac80211.tmpl | 335 + Documentation/feature-removal-schedule.txt | 37 - Documentation/laptops/acer-wmi.txt | 2 +- Documentation/networking/bcm43xx.txt | 89 - MAINTAINERS | 15 - arch/s390/defconfig | 8 +- drivers/net/8390.c | 6 +- drivers/net/Kconfig | 87 - drivers/net/Makefile | 3 +- drivers/net/appletalk/cops.c | 6 +- drivers/net/arcnet/com20020.c | 7 +- drivers/net/at1700.c | 7 +- drivers/net/atarilance.c | 7 +- drivers/net/atl1/Makefile | 2 - drivers/net/atl1/atl1.h | 286 - drivers/net/atl1/atl1_ethtool.c | 505 -- drivers/net/atl1/atl1_hw.c | 720 -- drivers/net/atl1/atl1_hw.h | 946 --- drivers/net/atl1/atl1_param.c | 203 - drivers/net/atlx/Makefile | 1 + drivers/net/{atl1/atl1_main.c => atlx/atl1.c} | 2120 ++++-- drivers/net/atlx/atl1.h | 796 ++ drivers/net/atlx/atlx.c | 433 + drivers/net/atlx/atlx.h | 506 ++ drivers/net/bonding/bond_main.c | 8 +- drivers/net/cassini.c | 12 +- drivers/net/cxgb3/l2t.c | 2 +- drivers/net/ixgbe/ixgbe.h | 87 +- drivers/net/ixgbe/ixgbe_ethtool.c | 39 +- drivers/net/ixgbe/ixgbe_main.c | 1520 +++- drivers/net/niu.c | 701 ++- drivers/net/niu.h | 4 +- drivers/net/s2io.c | 444 +- drivers/net/s2io.h | 50 +- drivers/net/sk98lin/Makefile | 87 - drivers/net/sk98lin/h/lm80.h | 179 - drivers/net/sk98lin/h/skaddr.h | 285 - drivers/net/sk98lin/h/skcsum.h | 213 - drivers/net/sk98lin/h/skdebug.h | 74 - drivers/net/sk98lin/h/skdrv1st.h | 188 - drivers/net/sk98lin/h/skdrv2nd.h | 447 - drivers/net/sk98lin/h/skerror.h | 55 - drivers/net/sk98lin/h/skgedrv.h | 51 - drivers/net/sk98lin/h/skgehw.h | 2126 ----- drivers/net/sk98lin/h/skgehwt.h | 48 - drivers/net/sk98lin/h/skgei2c.h | 210 - drivers/net/sk98lin/h/skgeinit.h | 797 -- drivers/net/sk98lin/h/skgepnm2.h | 334 - drivers/net/sk98lin/h/skgepnmi.h | 962 --- drivers/net/sk98lin/h/skgesirq.h | 110 - drivers/net/sk98lin/h/ski2c.h | 174 - drivers/net/sk98lin/h/skqueue.h | 94 - drivers/net/sk98lin/h/skrlmt.h | 438 - drivers/net/sk98lin/h/sktimer.h | 63 - drivers/net/sk98lin/h/sktypes.h | 69 - drivers/net/sk98lin/h/skversion.h | 38 - drivers/net/sk98lin/h/skvpd.h | 248 - drivers/net/sk98lin/h/xmac_ii.h | 1579 ---- drivers/net/sk98lin/skaddr.c | 1788 ---- drivers/net/sk98lin/skdim.c | 742 -- drivers/net/sk98lin/skethtool.c | 627 -- drivers/net/sk98lin/skge.c | 5218 ------------ drivers/net/sk98lin/skgehwt.c | 171 - drivers/net/sk98lin/skgeinit.c | 2005 ----- drivers/net/sk98lin/skgemib.c | 1075 --- drivers/net/sk98lin/skgepnmi.c | 8198 ------------------ drivers/net/sk98lin/skgesirq.c | 2229 ----- drivers/net/sk98lin/ski2c.c | 1296 --- drivers/net/sk98lin/sklm80.c | 141 - drivers/net/sk98lin/skqueue.c | 179 - drivers/net/sk98lin/skrlmt.c | 3257 ------- drivers/net/sk98lin/sktimer.c | 250 - drivers/net/sk98lin/skvpd.c | 1091 --- drivers/net/sk98lin/skxmac2.c | 4160 --------- drivers/net/smc91x.c | 335 +- drivers/net/smc91x.h | 331 +- drivers/net/tulip/Kconfig | 15 +- drivers/net/tulip/Makefile | 1 - drivers/net/tulip/xircom_tulip_cb.c | 1726 ---- drivers/net/via-velocity.c | 23 +- drivers/net/wan/cosa.c | 14 +- drivers/net/wireless/Kconfig | 45 +- drivers/net/wireless/Makefile | 1 - drivers/net/wireless/adm8211.c | 88 +- drivers/net/wireless/adm8211.h | 65 +- drivers/net/wireless/ath5k/Kconfig | 37 + drivers/net/wireless/ath5k/Makefile | 8 +- drivers/net/wireless/ath5k/ath5k.h | 159 +- drivers/net/wireless/ath5k/base.c | 558 +- drivers/net/wireless/ath5k/base.h | 18 +- drivers/net/wireless/ath5k/debug.c | 92 +- drivers/net/wireless/ath5k/debug.h | 29 +- drivers/net/wireless/ath5k/hw.c | 649 +- drivers/net/wireless/ath5k/hw.h | 150 +- drivers/net/wireless/ath5k/initvals.c | 239 +- drivers/net/wireless/ath5k/phy.c | 272 +- drivers/net/wireless/ath5k/reg.h | 4 +- drivers/net/wireless/atmel.c | 5 +- drivers/net/wireless/b43/b43.h | 132 +- drivers/net/wireless/b43/dma.c | 386 +- drivers/net/wireless/b43/dma.h | 11 +- drivers/net/wireless/b43/main.c | 628 +- drivers/net/wireless/b43/main.h | 11 +- drivers/net/wireless/b43/sysfs.c | 89 +- drivers/net/wireless/b43/wa.c | 45 +- drivers/net/wireless/b43/xmit.c | 122 +- drivers/net/wireless/b43/xmit.h | 12 - drivers/net/wireless/b43legacy/b43legacy.h | 46 +- drivers/net/wireless/b43legacy/main.c | 433 +- drivers/net/wireless/b43legacy/xmit.c | 78 +- drivers/net/wireless/bcm43xx/Kconfig | 70 - drivers/net/wireless/bcm43xx/Makefile | 12 - drivers/net/wireless/bcm43xx/bcm43xx.h | 997 --- drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 556 -- drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 118 - drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 1263 --- drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 386 - drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 - drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 - drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 352 - drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 33 - drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 307 - drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 62 - drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4281 ---------- drivers/net/wireless/bcm43xx/bcm43xx_main.h | 133 - drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2346 ----- drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 78 - drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 674 -- drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 163 - drivers/net/wireless/bcm43xx/bcm43xx_power.c | 393 - drivers/net/wireless/bcm43xx/bcm43xx_power.h | 56 - drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 2170 ----- drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 115 - drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 471 - drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h | 9 - drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1035 --- drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 - drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 565 -- drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | 150 - drivers/net/wireless/ipw2200.c | 4 +- drivers/net/wireless/iwlwifi/Kconfig | 22 +- drivers/net/wireless/iwlwifi/Makefile | 3 + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 63 +- drivers/net/wireless/iwlwifi/iwl-3945-core.h | 80 + drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 19 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 179 +- drivers/net/wireless/iwlwifi/iwl-3945-io.h | 41 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 150 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 8 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 419 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 59 +- drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 81 +- drivers/net/wireless/iwlwifi/iwl-4965-debug.h | 18 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 490 +-- drivers/net/wireless/iwlwifi/iwl-4965-io.h | 41 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 463 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 16 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 1212 ++-- drivers/net/wireless/iwlwifi/iwl-4965.h | 158 +- drivers/net/wireless/iwlwifi/iwl-core.c | 45 + drivers/net/wireless/iwlwifi/iwl-core.h | 94 + drivers/net/wireless/iwlwifi/iwl-csr.h | 259 + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 205 + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 399 + drivers/net/wireless/iwlwifi/iwl-helpers.h | 22 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 989 +-- drivers/net/wireless/iwlwifi/iwl4965-base.c | 1102 +-- drivers/net/wireless/libertas/assoc.c | 36 +- drivers/net/wireless/libertas/assoc.h | 1 - drivers/net/wireless/libertas/cmd.c | 154 +- drivers/net/wireless/libertas/cmd.h | 2 + drivers/net/wireless/libertas/cmdresp.c | 69 +- drivers/net/wireless/libertas/debugfs.c | 169 - drivers/net/wireless/libertas/dev.h | 6 +- drivers/net/wireless/libertas/hostcmd.h | 19 +- drivers/net/wireless/libertas/join.c | 20 - drivers/net/wireless/libertas/join.h | 2 - drivers/net/wireless/libertas/main.c | 14 +- drivers/net/wireless/libertas/scan.c | 685 +- drivers/net/wireless/libertas/scan.h | 123 +- drivers/net/wireless/libertas/types.h | 13 + drivers/net/wireless/libertas/wext.c | 3 + drivers/net/wireless/p54.h | 4 - drivers/net/wireless/p54common.c | 96 +- drivers/net/wireless/p54common.h | 75 - drivers/net/wireless/prism54/isl_ioctl.c | 46 +- drivers/net/wireless/prism54/islpci_dev.c | 2 +- drivers/net/wireless/prism54/islpci_dev.h | 6 +- drivers/net/wireless/rndis_wlan.c | 451 +- drivers/net/wireless/rt2x00/Kconfig | 64 +- drivers/net/wireless/rt2x00/Makefile | 37 +- drivers/net/wireless/rt2x00/rt2400pci.c | 480 +- drivers/net/wireless/rt2x00/rt2400pci.h | 14 +- drivers/net/wireless/rt2x00/rt2500pci.c | 491 +- drivers/net/wireless/rt2x00/rt2500pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500usb.c | 549 +- drivers/net/wireless/rt2x00/rt2500usb.h | 9 +- drivers/net/wireless/rt2x00/rt2x00.h | 350 +- drivers/net/wireless/rt2x00/rt2x00config.c | 175 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 125 +- drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 896 +-- drivers/net/wireless/rt2x00/rt2x00dump.h | 8 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 21 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 216 + drivers/net/wireless/rt2x00/rt2x00leds.h | 63 + drivers/net/wireless/rt2x00/rt2x00lib.h | 88 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 245 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 287 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 67 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 304 + drivers/net/wireless/rt2x00/rt2x00queue.h | 460 + drivers/net/wireless/rt2x00/rt2x00reg.h | 75 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- drivers/net/wireless/rt2x00/rt2x00ring.h | 290 - drivers/net/wireless/rt2x00/rt2x00usb.c | 331 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 161 +- drivers/net/wireless/rt2x00/rt61pci.c | 722 +- drivers/net/wireless/rt2x00/rt61pci.h | 33 +- drivers/net/wireless/rt2x00/rt73usb.c | 589 +- drivers/net/wireless/rt2x00/rt73usb.h | 24 +- drivers/net/wireless/rtl8180.h | 2 +- drivers/net/wireless/rtl8180_dev.c | 103 +- drivers/net/wireless/rtl8180_grf5101.c | 5 +- drivers/net/wireless/rtl8180_max2820.c | 5 +- drivers/net/wireless/rtl8180_rtl8225.c | 15 +- drivers/net/wireless/rtl8180_sa2400.c | 5 +- drivers/net/wireless/rtl8187.h | 2 +- drivers/net/wireless/rtl8187_dev.c | 92 +- drivers/net/wireless/rtl8187_rtl8225.c | 15 +- drivers/net/wireless/rtl818x.h | 70 - drivers/net/wireless/strip.c | 6 +- drivers/net/wireless/zd1211rw/zd_chip.c | 24 +- drivers/net/wireless/zd1211rw/zd_chip.h | 17 +- drivers/net/wireless/zd1211rw/zd_ieee80211.c | 11 +- drivers/net/wireless/zd1211rw/zd_mac.c | 241 +- drivers/net/wireless/zd1211rw/zd_mac.h | 5 +- drivers/net/wireless/zd1211rw/zd_usb.c | 11 +- drivers/s390/net/Kconfig | 84 +- drivers/s390/net/Makefile | 12 +- drivers/s390/net/ctcdbug.c | 80 - drivers/s390/net/ctcdbug.h | 125 - drivers/s390/net/ctcm_dbug.c | 67 + drivers/s390/net/ctcm_dbug.h | 158 + drivers/s390/net/ctcm_fsms.c | 2347 +++++ drivers/s390/net/ctcm_fsms.h | 359 + drivers/s390/net/ctcm_main.c | 1772 ++++ drivers/s390/net/ctcm_main.h | 287 + drivers/s390/net/ctcm_mpc.c | 2472 ++++++ drivers/s390/net/ctcm_mpc.h | 239 + drivers/s390/net/ctcm_sysfs.c | 210 + drivers/s390/net/ctcmain.c | 3062 ------- drivers/s390/net/ctcmain.h | 270 - drivers/s390/net/{qeth.h => qeth_core.h} | 811 +-- drivers/s390/net/qeth_core_main.c | 4540 ++++++++++ drivers/s390/net/qeth_core_mpc.c | 266 + drivers/s390/net/{qeth_mpc.h => qeth_core_mpc.h} | 143 +- drivers/s390/net/{qeth_eddp.c => qeth_core_offl.c} | 287 +- drivers/s390/net/{qeth_eddp.h => qeth_core_offl.h} | 50 +- drivers/s390/net/qeth_core_sys.c | 651 ++ drivers/s390/net/qeth_fs.h | 168 - drivers/s390/net/qeth_l2_main.c | 1242 +++ drivers/s390/net/qeth_l3.h | 76 + drivers/s390/net/qeth_l3_main.c | 3391 ++++++++ drivers/s390/net/qeth_l3_sys.c | 1051 +++ drivers/s390/net/qeth_main.c | 8956 -------------------- drivers/s390/net/qeth_mpc.c | 269 - drivers/s390/net/qeth_proc.c | 316 - drivers/s390/net/qeth_sys.c | 1858 ---- drivers/s390/net/qeth_tso.h | 148 - drivers/ssb/Kconfig | 15 + drivers/ssb/Makefile | 2 + drivers/ssb/driver_chipcommon.c | 10 + drivers/ssb/driver_gige.c | 294 + drivers/ssb/driver_mipscore.c | 1 + drivers/ssb/driver_pcicore.c | 160 +- drivers/ssb/embedded.c | 90 + drivers/ssb/main.c | 71 +- drivers/ssb/pci.c | 141 +- drivers/ssb/pcmcia.c | 550 ++- drivers/ssb/sprom.c | 133 + drivers/ssb/ssb_private.h | 19 + include/linux/atalk.h | 2 - include/linux/icmpv6.h | 11 +- include/linux/ieee80211.h | 35 + include/linux/if_arp.h | 6 + include/linux/igmp.h | 38 +- include/linux/in6.h | 11 + include/linux/inetdevice.h | 2 +- include/linux/ipv6.h | 39 +- include/linux/net.h | 3 +- include/linux/netdevice.h | 10 + include/linux/nl80211.h | 218 +- include/linux/skbuff.h | 5 +- include/linux/smc91x.h | 13 + include/linux/ssb/ssb.h | 21 +- include/linux/ssb/ssb_driver_chipcommon.h | 4 + include/linux/ssb/ssb_driver_gige.h | 174 + include/linux/ssb/ssb_driver_pci.h | 19 + include/linux/tcp.h | 7 + include/linux/udp.h | 19 +- include/linux/wireless.h | 1 + include/linux/xfrm.h | 3 +- include/net/addrconf.h | 31 +- include/net/cfg80211.h | 159 +- include/net/icmp.h | 2 +- include/net/ieee80211.h | 1 - include/net/ieee80211softmac.h | 373 - include/net/ieee80211softmac_wx.h | 99 - include/net/inet_hashtables.h | 2 +- include/net/inet_sock.h | 7 +- include/net/ip.h | 10 +- include/net/ip6_fib.h | 18 +- include/net/ip6_route.h | 41 +- include/net/ipv6.h | 23 +- include/net/llc_if.h | 5 - include/net/mac80211.h | 482 +- include/net/ndisc.h | 4 +- include/net/neighbour.h | 6 - include/net/netns/ipv4.h | 2 + include/net/netns/ipv6.h | 18 + include/net/protocol.h | 3 +- include/net/raw.h | 4 +- include/net/request_sock.h | 7 +- include/net/route.h | 1 - include/net/sctp/sctp.h | 5 - include/net/sctp/structs.h | 10 +- include/net/sock.h | 28 +- include/net/tcp.h | 16 +- include/net/tipc/tipc_bearer.h | 9 + include/net/tipc/tipc_port.h | 7 - include/net/udp.h | 7 +- include/net/wireless.h | 168 + include/net/xfrm.h | 69 +- net/8021q/vlan_dev.c | 12 +- net/8021q/vlanproc.c | 2 +- net/9p/error.c | 2 +- net/Kconfig | 2 +- net/appletalk/aarp.c | 21 +- net/atm/clip.c | 4 - net/atm/lec.c | 29 +- net/atm/proc.c | 32 +- net/bridge/br_netfilter.c | 14 +- net/bridge/br_sysfs_br.c | 6 +- net/core/dev.c | 8 +- net/core/dev_mcast.c | 37 +- net/core/dst.c | 3 - net/core/neighbour.c | 7 +- net/core/netpoll.c | 6 +- net/core/sock.c | 27 +- net/dccp/dccp.h | 6 +- net/dccp/ipv4.c | 20 +- net/dccp/ipv6.c | 40 +- net/dccp/minisocks.c | 2 +- net/decnet/af_decnet.c | 21 +- net/ieee80211/Kconfig | 1 - net/ieee80211/Makefile | 1 - net/ieee80211/softmac/Kconfig | 12 - net/ieee80211/softmac/Makefile | 9 - net/ieee80211/softmac/ieee80211softmac_assoc.c | 489 -- net/ieee80211/softmac/ieee80211softmac_auth.c | 413 - net/ieee80211/softmac/ieee80211softmac_event.c | 189 - net/ieee80211/softmac/ieee80211softmac_io.c | 488 -- net/ieee80211/softmac/ieee80211softmac_module.c | 568 -- net/ieee80211/softmac/ieee80211softmac_priv.h | 244 - net/ieee80211/softmac/ieee80211softmac_scan.c | 254 - net/ieee80211/softmac/ieee80211softmac_wx.c | 508 -- net/ipv4/af_inet.c | 45 +- net/ipv4/arp.c | 56 +- net/ipv4/cipso_ipv4.c | 1 - net/ipv4/devinet.c | 21 +- net/ipv4/fib_trie.c | 179 +- net/ipv4/icmp.c | 111 +- net/ipv4/igmp.c | 41 +- net/ipv4/inet_connection_sock.c | 15 +- net/ipv4/inet_hashtables.c | 8 +- net/ipv4/inet_timewait_sock.c | 1 + net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_fragment.c | 5 +- net/ipv4/ip_gre.c | 4 +- net/ipv4/ip_input.c | 19 +- net/ipv4/ip_options.c | 63 +- net/ipv4/ip_output.c | 26 +- net/ipv4/ip_sockglue.c | 13 +- net/ipv4/ipconfig.c | 7 +- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 6 +- net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 +- net/ipv4/ipvs/ip_vs_proto_udp.c | 2 +- net/ipv4/ipvs/ip_vs_sync.c | 4 +- net/ipv4/netfilter/arp_tables.c | 7 +- net/ipv4/netfilter/ip_tables.c | 2 +- net/ipv4/netfilter/ipt_MASQUERADE.c | 16 +- .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 2 +- net/ipv4/netfilter/nf_nat_helper.c | 4 +- net/ipv4/raw.c | 28 +- net/ipv4/route.c | 137 +- net/ipv4/syncookies.c | 13 +- net/ipv4/tcp.c | 18 +- net/ipv4/tcp_cubic.c | 35 +- net/ipv4/tcp_input.c | 49 +- net/ipv4/tcp_ipv4.c | 116 +- net/ipv4/tcp_minisocks.c | 36 +- net/ipv4/tcp_output.c | 5 +- net/ipv4/tcp_timer.c | 5 + net/ipv4/udp.c | 85 +- net/ipv4/udp_impl.h | 6 +- net/ipv4/udplite.c | 49 +- net/ipv6/Makefile | 1 + net/ipv6/addrconf.c | 619 +- net/ipv6/addrlabel.c | 19 +- net/ipv6/af_inet6.c | 209 +- net/ipv6/anycast.c | 2 +- net/ipv6/fib6_rules.c | 113 +- net/ipv6/icmp.c | 141 +- net/ipv6/inet6_hashtables.c | 2 +- net/ipv6/ip6_fib.c | 292 +- net/ipv6/ip6_input.c | 5 - net/ipv6/ip6_output.c | 32 +- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/ipv6_sockglue.c | 207 +- net/ipv6/mcast.c | 207 +- net/ipv6/mip6.c | 20 +- net/ipv6/ndisc.c | 144 +- net/ipv6/netfilter.c | 4 +- net/ipv6/netfilter/ip6_tables.c | 2 +- net/ipv6/netfilter/ip6t_REJECT.c | 4 +- net/ipv6/proc.c | 3 + net/ipv6/raw.c | 22 +- net/ipv6/route.c | 582 +- net/ipv6/sit.c | 6 +- net/ipv6/syncookies.c | 267 + net/ipv6/sysctl_net_ipv6.c | 15 +- net/ipv6/tcp_ipv6.c | 181 +- net/ipv6/udp.c | 20 +- net/ipv6/udp_impl.h | 2 + net/ipv6/udplite.c | 27 +- net/ipv6/xfrm6_input.c | 55 +- net/ipv6/xfrm6_policy.c | 7 +- net/ipv6/xfrm6_state.c | 171 +- net/ipv6/xfrm6_tunnel.c | 45 +- net/irda/af_irda.c | 178 +- net/irda/discovery.c | 4 +- net/irda/ircomm/ircomm_core.c | 46 +- net/irda/ircomm/ircomm_event.c | 12 +- net/irda/ircomm/ircomm_lmp.c | 30 +- net/irda/ircomm/ircomm_param.c | 32 +- net/irda/ircomm/ircomm_ttp.c | 26 +- net/irda/ircomm/ircomm_tty.c | 90 +- net/irda/ircomm/ircomm_tty_attach.c | 78 +- net/irda/ircomm/ircomm_tty_ioctl.c | 18 +- net/irda/irda_device.c | 18 +- net/irda/iriap.c | 76 +- net/irda/iriap_event.c | 38 +- net/irda/irias_object.c | 44 +- net/irda/irlan/irlan_client.c | 48 +- net/irda/irlan/irlan_client_event.c | 64 +- net/irda/irlan/irlan_common.c | 72 +- net/irda/irlan/irlan_eth.c | 18 +- net/irda/irlan/irlan_event.c | 4 +- net/irda/irlan/irlan_filter.c | 4 +- net/irda/irlan/irlan_provider.c | 30 +- net/irda/irlan/irlan_provider_event.c | 16 +- net/irda/irlap.c | 56 +- net/irda/irlap_event.c | 122 +- net/irda/irlap_frame.c | 74 +- net/irda/irlmp.c | 112 +- net/irda/irlmp_event.c | 94 +- net/irda/irlmp_frame.c | 36 +- net/irda/irmod.c | 2 +- net/irda/irnet/irnet.h | 10 +- net/irda/irnetlink.c | 4 +- net/irda/irqueue.c | 8 +- net/irda/irttp.c | 108 +- net/irda/parameters.c | 42 +- net/irda/qos.c | 24 +- net/irda/wrapper.c | 18 +- net/key/af_key.c | 120 +- net/llc/af_llc.c | 16 +- net/llc/llc_c_ac.c | 2 +- net/llc/llc_c_ev.c | 8 +- net/llc/llc_conn.c | 24 +- net/llc/llc_input.c | 4 +- net/mac80211/Kconfig | 33 +- net/mac80211/Makefile | 9 +- net/mac80211/cfg.c | 400 +- net/mac80211/debugfs.c | 47 +- net/mac80211/debugfs_netdev.c | 206 +- net/mac80211/debugfs_sta.c | 174 +- net/mac80211/debugfs_sta.h | 2 + net/mac80211/ieee80211.c | 959 ++- net/mac80211/ieee80211_i.h | 468 +- net/mac80211/ieee80211_iface.c | 48 +- net/mac80211/ieee80211_ioctl.c | 234 +- net/mac80211/ieee80211_key.h | 26 +- net/mac80211/ieee80211_rate.c | 23 +- net/mac80211/ieee80211_rate.h | 44 +- net/mac80211/ieee80211_sta.c | 1525 +++-- net/mac80211/key.c | 183 +- net/mac80211/mesh.c | 449 + net/mac80211/mesh.h | 290 + net/mac80211/mesh_hwmp.c | 857 ++ net/mac80211/mesh_pathtbl.c | 516 ++ net/mac80211/mesh_plink.c | 761 ++ net/mac80211/rc80211_pid_algo.c | 122 +- net/mac80211/rc80211_simple.c | 400 - net/mac80211/regdomain.c | 152 - net/mac80211/rx.c | 857 ++- net/mac80211/sta_info.c | 550 +- net/mac80211/sta_info.h | 322 +- net/mac80211/tx.c | 727 +- net/mac80211/util.c | 170 +- net/mac80211/wep.c | 40 +- net/mac80211/wep.h | 8 +- net/mac80211/wme.c | 139 +- net/mac80211/wme.h | 23 +- net/mac80211/wpa.c | 152 +- net/mac80211/wpa.h | 24 +- net/netfilter/core.c | 8 + net/netfilter/nf_conntrack_netbios_ns.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 2 +- net/netlink/af_netlink.c | 53 +- net/packet/af_packet.c | 3 +- net/rxrpc/ar-internal.h | 8 +- net/rxrpc/ar-proc.c | 4 +- net/sched/em_meta.c | 4 +- net/sctp/associola.c | 8 +- net/sctp/chunk.c | 18 +- net/sctp/input.c | 2 +- net/sctp/ipv6.c | 15 +- net/sctp/output.c | 14 +- net/sctp/outqueue.c | 17 +- net/sctp/proc.c | 20 +- net/sctp/protocol.c | 15 +- net/sctp/sm_make_chunk.c | 2 +- net/sctp/sm_sideeffect.c | 6 +- net/sctp/sm_statefuns.c | 20 +- net/sctp/socket.c | 18 +- net/sctp/transport.c | 10 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/clnt.c | 44 +- net/sunrpc/rpc_pipe.c | 12 +- net/sunrpc/rpcb_clnt.c | 20 +- net/sunrpc/xprtsock.c | 2 +- net/tipc/core.c | 11 +- net/tipc/core.h | 6 + net/tipc/link.c | 16 +- net/tipc/msg.c | 16 +- net/tipc/msg.h | 50 +- net/tipc/port.c | 12 +- net/tipc/socket.c | 61 +- net/unix/af_unix.c | 2 +- net/wireless/Makefile | 2 +- net/wireless/core.c | 41 + net/wireless/core.h | 3 + net/wireless/nl80211.c | 552 ++- net/wireless/reg.c | 159 + net/wireless/util.c | 98 + net/xfrm/xfrm_policy.c | 128 +- net/xfrm/xfrm_state.c | 53 +- net/xfrm/xfrm_user.c | 71 +- 564 files changed, 52913 insertions(+), 100630 deletions(-) create mode 100644 Documentation/DocBook/mac80211.tmpl delete mode 100644 Documentation/networking/bcm43xx.txt delete mode 100644 drivers/net/atl1/Makefile delete mode 100644 drivers/net/atl1/atl1.h delete mode 100644 drivers/net/atl1/atl1_ethtool.c delete mode 100644 drivers/net/atl1/atl1_hw.c delete mode 100644 drivers/net/atl1/atl1_hw.h delete mode 100644 drivers/net/atl1/atl1_param.c create mode 100644 drivers/net/atlx/Makefile rename drivers/net/{atl1/atl1_main.c => atlx/atl1.c} (57%) create mode 100644 drivers/net/atlx/atl1.h create mode 100644 drivers/net/atlx/atlx.c create mode 100644 drivers/net/atlx/atlx.h delete mode 100644 drivers/net/sk98lin/Makefile delete mode 100644 drivers/net/sk98lin/h/lm80.h delete mode 100644 drivers/net/sk98lin/h/skaddr.h delete mode 100644 drivers/net/sk98lin/h/skcsum.h delete mode 100644 drivers/net/sk98lin/h/skdebug.h delete mode 100644 drivers/net/sk98lin/h/skdrv1st.h delete mode 100644 drivers/net/sk98lin/h/skdrv2nd.h delete mode 100644 drivers/net/sk98lin/h/skerror.h delete mode 100644 drivers/net/sk98lin/h/skgedrv.h delete mode 100644 drivers/net/sk98lin/h/skgehw.h delete mode 100644 drivers/net/sk98lin/h/skgehwt.h delete mode 100644 drivers/net/sk98lin/h/skgei2c.h delete mode 100644 drivers/net/sk98lin/h/skgeinit.h delete mode 100644 drivers/net/sk98lin/h/skgepnm2.h delete mode 100644 drivers/net/sk98lin/h/skgepnmi.h delete mode 100644 drivers/net/sk98lin/h/skgesirq.h delete mode 100644 drivers/net/sk98lin/h/ski2c.h delete mode 100644 drivers/net/sk98lin/h/skqueue.h delete mode 100644 drivers/net/sk98lin/h/skrlmt.h delete mode 100644 drivers/net/sk98lin/h/sktimer.h delete mode 100644 drivers/net/sk98lin/h/sktypes.h delete mode 100644 drivers/net/sk98lin/h/skversion.h delete mode 100644 drivers/net/sk98lin/h/skvpd.h delete mode 100644 drivers/net/sk98lin/h/xmac_ii.h delete mode 100644 drivers/net/sk98lin/skaddr.c delete mode 100644 drivers/net/sk98lin/skdim.c delete mode 100644 drivers/net/sk98lin/skethtool.c delete mode 100644 drivers/net/sk98lin/skge.c delete mode 100644 drivers/net/sk98lin/skgehwt.c delete mode 100644 drivers/net/sk98lin/skgeinit.c delete mode 100644 drivers/net/sk98lin/skgemib.c delete mode 100644 drivers/net/sk98lin/skgepnmi.c delete mode 100644 drivers/net/sk98lin/skgesirq.c delete mode 100644 drivers/net/sk98lin/ski2c.c delete mode 100644 drivers/net/sk98lin/sklm80.c delete mode 100644 drivers/net/sk98lin/skqueue.c delete mode 100644 drivers/net/sk98lin/skrlmt.c delete mode 100644 drivers/net/sk98lin/sktimer.c delete mode 100644 drivers/net/sk98lin/skvpd.c delete mode 100644 drivers/net/sk98lin/skxmac2.c delete mode 100644 drivers/net/tulip/xircom_tulip_cb.c create mode 100644 drivers/net/wireless/ath5k/Kconfig delete mode 100644 drivers/net/wireless/bcm43xx/Kconfig delete mode 100644 drivers/net/wireless/bcm43xx/Makefile delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_dma.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_dma.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_leds.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_leds.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_main.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_main.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_phy.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_phy.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_pio.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_pio.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_power.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_power.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_radio.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_radio.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_wx.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_wx.h delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_xmit.c delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_xmit.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-core.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-csr.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.h create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.c create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.h create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.c create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.h delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ring.h delete mode 100644 drivers/s390/net/ctcdbug.c delete mode 100644 drivers/s390/net/ctcdbug.h create mode 100644 drivers/s390/net/ctcm_dbug.c create mode 100644 drivers/s390/net/ctcm_dbug.h create mode 100644 drivers/s390/net/ctcm_fsms.c create mode 100644 drivers/s390/net/ctcm_fsms.h create mode 100644 drivers/s390/net/ctcm_main.c create mode 100644 drivers/s390/net/ctcm_main.h create mode 100644 drivers/s390/net/ctcm_mpc.c create mode 100644 drivers/s390/net/ctcm_mpc.h create mode 100644 drivers/s390/net/ctcm_sysfs.c delete mode 100644 drivers/s390/net/ctcmain.c delete mode 100644 drivers/s390/net/ctcmain.h rename drivers/s390/net/{qeth.h => qeth_core.h} (52%) create mode 100644 drivers/s390/net/qeth_core_main.c create mode 100644 drivers/s390/net/qeth_core_mpc.c rename drivers/s390/net/{qeth_mpc.h => qeth_core_mpc.h} (78%) rename drivers/s390/net/{qeth_eddp.c => qeth_core_offl.c} (67%) rename drivers/s390/net/{qeth_eddp.h => qeth_core_offl.h} (55%) create mode 100644 drivers/s390/net/qeth_core_sys.c delete mode 100644 drivers/s390/net/qeth_fs.h create mode 100644 drivers/s390/net/qeth_l2_main.c create mode 100644 drivers/s390/net/qeth_l3.h create mode 100644 drivers/s390/net/qeth_l3_main.c create mode 100644 drivers/s390/net/qeth_l3_sys.c delete mode 100644 drivers/s390/net/qeth_main.c delete mode 100644 drivers/s390/net/qeth_mpc.c delete mode 100644 drivers/s390/net/qeth_proc.c delete mode 100644 drivers/s390/net/qeth_sys.c delete mode 100644 drivers/s390/net/qeth_tso.h create mode 100644 drivers/ssb/driver_gige.c create mode 100644 drivers/ssb/sprom.c create mode 100644 include/linux/smc91x.h create mode 100644 include/linux/ssb/ssb_driver_gige.h delete mode 100644 include/net/ieee80211softmac.h delete mode 100644 include/net/ieee80211softmac_wx.h delete mode 100644 net/ieee80211/softmac/Kconfig delete mode 100644 net/ieee80211/softmac/Makefile delete mode 100644 net/ieee80211/softmac/ieee80211softmac_assoc.c delete mode 100644 net/ieee80211/softmac/ieee80211softmac_auth.c delete mode 100644 net/ieee80211/softmac/ieee80211softmac_event.c delete mode 100644 net/ieee80211/softmac/ieee80211softmac_io.c delete mode 100644 net/ieee80211/softmac/ieee80211softmac_module.c delete mode 100644 net/ieee80211/softmac/ieee80211softmac_priv.h delete mode 100644 net/ieee80211/softmac/ieee80211softmac_scan.c delete mode 100644 net/ieee80211/softmac/ieee80211softmac_wx.c create mode 100644 net/ipv6/syncookies.c create mode 100644 net/mac80211/mesh.c create mode 100644 net/mac80211/mesh.h create mode 100644 net/mac80211/mesh_hwmp.c create mode 100644 net/mac80211/mesh_pathtbl.c create mode 100644 net/mac80211/mesh_plink.c delete mode 100644 net/mac80211/rc80211_simple.c delete mode 100644 net/mac80211/regdomain.c create mode 100644 net/wireless/reg.c create mode 100644 net/wireless/util.c Merging galak/powerpc-next $ git merge galak/powerpc-next Renamed arch/powerpc/mm/lmb.c->lib/lmb.c Auto-merged lib/lmb.c Auto-merged arch/powerpc/Kconfig Auto-merged arch/powerpc/boot/Makefile Auto-merged arch/powerpc/kernel/prom.c Auto-merged arch/powerpc/kernel/setup-common.c Auto-merged arch/powerpc/mm/hash_utils_64.c Auto-merged arch/powerpc/platforms/maple/setup.c Auto-merged arch/powerpc/platforms/powermac/setup.c Auto-merged drivers/net/Makefile Auto-merged lib/Makefile Merge made by recursive. arch/powerpc/Kconfig | 16 - arch/powerpc/Makefile | 10 +- arch/powerpc/boot/Makefile | 8 + arch/powerpc/boot/dts/ksi8560.dts | 267 ++++++++++ arch/powerpc/boot/wrapper | 14 +- arch/powerpc/configs/ksi8560_defconfig | 899 ++++++++++++++++++++++++++++++++ arch/powerpc/platforms/85xx/Kconfig | 7 + arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/ksi8560.c | 257 +++++++++ 9 files changed, 1454 insertions(+), 25 deletions(-) create mode 100644 arch/powerpc/boot/dts/ksi8560.dts create mode 100644 arch/powerpc/configs/ksi8560_defconfig create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c Merging mtd/master $ git merge mtd/master Merge made by recursive. drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- fs/jffs2/fs.c | 14 +++++++++++--- 2 files changed, 28 insertions(+), 18 deletions(-) Merging wireless/master $ git merge wireless/master Merge made by recursive. drivers/net/ps3_gelic_wireless.c | 2 +- drivers/net/wireless/b43/Makefile | 4 +- drivers/net/wireless/b43/nphy.h | 40 + drivers/net/wireless/ipw2200.c | 12 +- drivers/net/wireless/ipw2200.h | 112 +- drivers/net/wireless/iwlwifi/Kconfig | 8 +- drivers/net/wireless/iwlwifi/Makefile | 6 +- drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 39 - drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 32 - drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 28 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 3 - drivers/net/wireless/iwlwifi/iwl-4965-io.h | 94 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 53 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 560 ++++--- drivers/net/wireless/iwlwifi/iwl-4965.h | 210 ++-- drivers/net/wireless/iwlwifi/iwl-core.c | 216 +++- drivers/net/wireless/iwlwifi/iwl-core.h | 55 + .../iwlwifi/{iwl-4965-debug.h => iwl-debug.h} | 55 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 319 ++++ drivers/net/wireless/iwlwifi/iwl-eeprom.c | 368 ++++- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 58 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 251 +++ drivers/net/wireless/iwlwifi/iwl4965-base.c | 1729 +++++++------------- drivers/net/wireless/libertas/11d.c | 16 +- drivers/net/wireless/libertas/11d.h | 5 +- drivers/net/wireless/libertas/assoc.c | 16 +- drivers/net/wireless/libertas/cmd.c | 254 +-- drivers/net/wireless/libertas/cmd.h | 9 +- drivers/net/wireless/libertas/cmdresp.c | 66 +- drivers/net/wireless/libertas/debugfs.c | 8 +- drivers/net/wireless/libertas/decl.h | 5 +- drivers/net/wireless/libertas/dev.h | 4 +- drivers/net/wireless/libertas/host.h | 3 - drivers/net/wireless/libertas/hostcmd.h | 7 +- drivers/net/wireless/libertas/if_cs.c | 3 + drivers/net/wireless/libertas/join.c | 9 +- drivers/net/wireless/libertas/join.h | 9 +- drivers/net/wireless/libertas/main.c | 35 +- drivers/net/wireless/libertas/scan.c | 4 +- drivers/net/wireless/libertas/scan.h | 7 +- drivers/net/wireless/libertas/wext.c | 40 +- drivers/net/wireless/rt2x00/Kconfig | 4 +- drivers/net/wireless/rt2x00/rt2400pci.c | 99 +- drivers/net/wireless/rt2x00/rt2500pci.c | 110 +- drivers/net/wireless/rt2x00/rt2500usb.c | 127 +- drivers/net/wireless/rt2x00/rt2x00.h | 11 +- drivers/net/wireless/rt2x00/rt2x00config.c | 10 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 15 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 57 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 22 +- drivers/net/wireless/rt2x00/rt61pci.c | 114 +- drivers/net/wireless/rt2x00/rt73usb.c | 131 +- include/net/mac80211.h | 47 + include/net/wireless.h | 6 + net/mac80211/ieee80211.c | 7 +- net/mac80211/ieee80211_i.h | 2 + net/mac80211/ieee80211_ioctl.c | 31 +- net/mac80211/ieee80211_sta.c | 125 +- net/mac80211/tkip.c | 68 +- net/mac80211/tkip.h | 2 +- net/mac80211/wpa.c | 2 +- net/wireless/util.c | 23 + 62 files changed, 3199 insertions(+), 2568 deletions(-) rename drivers/net/wireless/iwlwifi/{iwl-4965-debug.h => iwl-debug.h} (82%) create mode 100644 drivers/net/wireless/iwlwifi/iwl-debugfs.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-hcmd.c Merging vfs/vfs-2.6.25 $ git merge vfs/vfs-2.6.25 Auto-merged fs/nfs/dir.c Auto-merged fs/nfs/super.c Auto-merged fs/nfsd/nfs4state.c Auto-merged fs/nfsd/vfs.c Auto-merged fs/ocfs2/ioctl.c Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c Auto-merged fs/xfs/linux-2.6/xfs_iops.c Auto-merged fs/xfs/linux-2.6/xfs_lrw.c Auto-merged include/linux/security.h Auto-merged lib/Kconfig.debug Auto-merged net/unix/af_unix.c Auto-merged security/dummy.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c Auto-merged security/smack/smack_lsm.c Auto-merged virt/kvm/kvm_main.c Recorded preimage for 'fs/xfs/linux-2.6/xfs_ioctl.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. fs/afs/internal.h | 1 - fs/afs/mntpt.c | 8 - fs/afs/super.c | 1 - fs/anon_inodes.c | 42 ++- fs/cifs/cifs_dfs_ref.c | 1 - fs/eventfd.c | 5 +- fs/eventpoll.c | 7 +- fs/ext2/ioctl.c | 47 +++-- fs/ext3/ioctl.c | 103 +++++--- fs/fat/file.c | 12 +- fs/file_table.c | 48 ++++- fs/hfsplus/ioctl.c | 38 ++- fs/hppfs/hppfs_kern.c | 435 +++++++++++++++----------------- fs/hugetlbfs/inode.c | 2 +- fs/inode.c | 51 ++-- fs/internal.h | 11 + fs/jfs/ioctl.c | 33 ++- fs/namei.c | 338 ++++++++++++++++++------- fs/namespace.c | 572 ++++++++++++++++++++++++++++++------------ fs/ncpfs/ioctl.c | 54 ++++- fs/nfs/dir.c | 3 +- fs/nfs/super.c | 2 - fs/nfsd/nfs4proc.c | 7 +- fs/nfsd/nfs4recover.c | 5 + fs/nfsd/nfs4state.c | 3 +- fs/nfsd/vfs.c | 26 ++- fs/ocfs2/ioctl.c | 11 +- fs/open.c | 161 ++++++++---- fs/pipe.c | 19 +- fs/pnode.c | 6 +- fs/reiserfs/ioctl.c | 63 +++-- fs/reiserfs/xattr.c | 110 +++------ fs/signalfd.c | 6 +- fs/super.c | 26 ++- fs/timerfd.c | 5 +- fs/utimes.c | 18 +- fs/xattr.c | 16 +- fs/xfs/linux-2.6/xfs_ioctl.c | 15 +- fs/xfs/linux-2.6/xfs_iops.c | 7 - fs/xfs/linux-2.6/xfs_lrw.c | 9 +- include/linux/anon_inodes.h | 6 +- include/linux/dcache.h | 1 - include/linux/file.h | 1 + include/linux/fs.h | 58 ++++- include/linux/mount.h | 15 +- include/linux/security.h | 52 ++-- ipc/mqueue.c | 25 ++- lib/Kconfig.debug | 10 + mm/tiny-shmem.c | 2 + net/unix/af_unix.c | 4 + security/dummy.c | 10 +- security/security.c | 20 +- security/selinux/hooks.c | 8 +- security/smack/smack_lsm.c | 4 +- virt/kvm/kvm_main.c | 17 +- 55 files changed, 1633 insertions(+), 927 deletions(-) Merging semaphore/semaphore-20080314 $ git merge semaphore/semaphore-20080314 Removed arch/alpha/kernel/semaphore.c Removed arch/arm/kernel/semaphore.c Removed arch/avr32/kernel/semaphore.c Removed arch/cris/kernel/semaphore.c Removed arch/frv/kernel/semaphore.c Removed arch/h8300/kernel/semaphore.c Removed arch/ia64/kernel/semaphore.c Removed arch/m32r/kernel/semaphore.c Removed arch/m68k/kernel/semaphore.c Removed arch/m68k/lib/semaphore.S Removed arch/m68knommu/kernel/semaphore.c Removed arch/m68knommu/lib/semaphore.S Removed arch/mips/kernel/semaphore.c Removed arch/mn10300/kernel/semaphore.c Removed arch/parisc/kernel/semaphore.c Auto-merged arch/powerpc/kernel/ppc_ksyms.c Removed arch/powerpc/kernel/semaphore.c Removed arch/ppc/kernel/semaphore.c Auto-merged arch/s390/kernel/Makefile Removed arch/s390/kernel/semaphore.c Removed arch/sh/kernel/semaphore.c Removed arch/sparc/kernel/semaphore.c Removed arch/sparc64/kernel/semaphore.c Removed arch/v850/kernel/semaphore.c Auto-merged arch/x86/Kconfig Removed arch/xtensa/kernel/semaphore.c Auto-merged drivers/acpi/osl.c Removed include/asm-arm/semaphore-helper.h Removed include/asm-blackfin/semaphore-helper.h Removed include/asm-cris/semaphore-helper.h Removed include/asm-h8300/semaphore-helper.h Removed include/asm-m68k/semaphore-helper.h Removed include/asm-m68knommu/semaphore-helper.h Removed include/asm-parisc/semaphore-helper.h Removed include/asm-sh/semaphore-helper.h Removed include/asm-x86/semaphore_32.h Removed include/asm-x86/semaphore_64.h Auto-merged kernel/Makefile Auto-merged lib/Makefile Removed lib/semaphore-sleepers.c Merge made by recursive. arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/alpha_ksyms.c | 9 - arch/alpha/kernel/semaphore.c | 224 -------------------------- arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/semaphore.c | 221 -------------------------- arch/avr32/kernel/Makefile | 2 +- arch/avr32/kernel/semaphore.c | 148 ----------------- arch/blackfin/Kconfig | 4 - arch/blackfin/kernel/bfin_ksyms.c | 5 - arch/cris/kernel/Makefile | 3 +- arch/cris/kernel/crisksyms.c | 7 - arch/cris/kernel/semaphore.c | 129 --------------- arch/frv/kernel/Makefile | 2 +- arch/frv/kernel/frv_ksyms.c | 1 - arch/frv/kernel/semaphore.c | 155 ------------------ arch/h8300/kernel/Makefile | 2 +- arch/h8300/kernel/h8300_ksyms.c | 1 - arch/h8300/kernel/semaphore.c | 132 ---------------- arch/ia64/kernel/Makefile | 2 +- arch/ia64/kernel/ia64_ksyms.c | 6 - arch/ia64/kernel/semaphore.c | 165 ------------------- arch/m32r/kernel/Makefile | 2 +- arch/m32r/kernel/m32r_ksyms.c | 5 - arch/m32r/kernel/semaphore.c | 185 ---------------------- arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/m68k_ksyms.c | 6 - arch/m68k/kernel/semaphore.c | 132 ---------------- arch/m68k/lib/Makefile | 2 +- arch/m68k/lib/semaphore.S | 53 ------ arch/m68knommu/kernel/Makefile | 2 +- arch/m68knommu/kernel/m68k_ksyms.c | 6 - arch/m68knommu/kernel/semaphore.c | 133 ---------------- arch/m68knommu/lib/Makefile | 2 +- arch/m68knommu/lib/semaphore.S | 66 -------- arch/mips/kernel/Makefile | 2 +- arch/mips/kernel/semaphore.c | 168 -------------------- arch/mn10300/kernel/Makefile | 2 +- arch/mn10300/kernel/semaphore.c | 149 ----------------- arch/parisc/kernel/Makefile | 2 +- arch/parisc/kernel/parisc_ksyms.c | 5 - arch/parisc/kernel/semaphore.c | 102 ------------ arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/ppc_ksyms.c | 1 - arch/powerpc/kernel/semaphore.c | 135 ---------------- arch/ppc/kernel/semaphore.c | 131 --------------- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/s390_ksyms.c | 7 - arch/s390/kernel/semaphore.c | 108 ------------- arch/sh/kernel/Makefile_32 | 2 +- arch/sh/kernel/Makefile_64 | 2 +- arch/sh/kernel/semaphore.c | 139 ---------------- arch/sh/kernel/sh_ksyms_32.c | 7 - arch/sh/kernel/sh_ksyms_64.c | 4 - arch/sparc/kernel/Makefile | 2 +- arch/sparc/kernel/semaphore.c | 155 ------------------ arch/sparc/kernel/sparc_ksyms.c | 5 - arch/sparc64/kernel/Makefile | 2 +- arch/sparc64/kernel/semaphore.c | 254 ------------------------------ arch/sparc64/kernel/sparc64_ksyms.c | 6 - arch/um/Kconfig.i386 | 4 - arch/um/Kconfig.x86_64 | 4 - arch/um/sys-i386/ksyms.c | 12 -- arch/um/sys-ppc/Makefile | 8 +- arch/um/sys-x86_64/ksyms.c | 13 +-- arch/v850/kernel/Makefile | 2 +- arch/v850/kernel/semaphore.c | 166 ------------------- arch/v850/kernel/v850_ksyms.c | 7 - arch/x86/Kconfig | 3 - arch/x86/kernel/i386_ksyms_32.c | 5 - arch/x86/kernel/x8664_ksyms_64.c | 6 - arch/x86/lib/semaphore_32.S | 83 ---------- arch/x86/lib/thunk_64.S | 5 - arch/xtensa/kernel/Makefile | 2 +- arch/xtensa/kernel/semaphore.c | 226 -------------------------- arch/xtensa/kernel/xtensa_ksyms.c | 9 - drivers/acpi/osl.c | 89 +++-------- include/asm-alpha/semaphore.h | 150 +----------------- include/asm-arm/semaphore-helper.h | 84 ---------- include/asm-arm/semaphore.h | 99 +------------ include/asm-avr32/semaphore.h | 109 +------------- include/asm-blackfin/semaphore-helper.h | 82 ---------- include/asm-blackfin/semaphore.h | 106 +------------ include/asm-cris/semaphore-helper.h | 78 --------- include/asm-cris/semaphore.h | 134 +---------------- include/asm-frv/semaphore.h | 156 +------------------ include/asm-h8300/semaphore-helper.h | 85 ---------- include/asm-h8300/semaphore.h | 191 +---------------------- include/asm-ia64/semaphore.h | 100 +------------ include/asm-m32r/semaphore.h | 145 +----------------- include/asm-m68k/semaphore-helper.h | 142 ----------------- include/asm-m68k/semaphore.h | 164 +------------------- include/asm-m68knommu/semaphore-helper.h | 82 ---------- include/asm-m68knommu/semaphore.h | 154 +------------------ include/asm-mips/semaphore.h | 109 +------------- include/asm-mn10300/semaphore.h | 170 +-------------------- include/asm-parisc/semaphore-helper.h | 89 ----------- include/asm-parisc/semaphore.h | 146 +----------------- include/asm-powerpc/semaphore.h | 95 +----------- include/asm-s390/semaphore.h | 108 +------------- include/asm-sh/semaphore-helper.h | 89 ----------- include/asm-sh/semaphore.h | 116 +-------------- include/asm-sparc/semaphore.h | 193 +---------------------- include/asm-sparc64/semaphore.h | 54 +------ include/asm-um/semaphore.h | 7 +- include/asm-v850/semaphore.h | 85 +---------- include/asm-x86/semaphore.h | 6 +- include/asm-x86/semaphore_32.h | 175 -------------------- include/asm-x86/semaphore_64.h | 180 --------------------- include/asm-xtensa/semaphore.h | 100 +------------ include/linux/quota.h | 8 +- include/linux/semaphore.h | 86 ++++++++++ kernel/Makefile | 2 +- kernel/semaphore.c | 207 ++++++++++++++++++++++++ lib/Makefile | 1 - lib/kernel_lock.c | 1 + lib/semaphore-sleepers.c | 176 --------------------- 116 files changed, 371 insertions(+), 7749 deletions(-) delete mode 100644 arch/alpha/kernel/semaphore.c delete mode 100644 arch/arm/kernel/semaphore.c delete mode 100644 arch/avr32/kernel/semaphore.c delete mode 100644 arch/cris/kernel/semaphore.c delete mode 100644 arch/frv/kernel/semaphore.c delete mode 100644 arch/h8300/kernel/semaphore.c delete mode 100644 arch/ia64/kernel/semaphore.c delete mode 100644 arch/m32r/kernel/semaphore.c delete mode 100644 arch/m68k/kernel/semaphore.c delete mode 100644 arch/m68k/lib/semaphore.S delete mode 100644 arch/m68knommu/kernel/semaphore.c delete mode 100644 arch/m68knommu/lib/semaphore.S delete mode 100644 arch/mips/kernel/semaphore.c delete mode 100644 arch/mn10300/kernel/semaphore.c delete mode 100644 arch/parisc/kernel/semaphore.c delete mode 100644 arch/powerpc/kernel/semaphore.c delete mode 100644 arch/ppc/kernel/semaphore.c delete mode 100644 arch/s390/kernel/semaphore.c delete mode 100644 arch/sh/kernel/semaphore.c delete mode 100644 arch/sparc/kernel/semaphore.c delete mode 100644 arch/sparc64/kernel/semaphore.c delete mode 100644 arch/v850/kernel/semaphore.c delete mode 100644 arch/xtensa/kernel/semaphore.c delete mode 100644 include/asm-arm/semaphore-helper.h delete mode 100644 include/asm-blackfin/semaphore-helper.h delete mode 100644 include/asm-cris/semaphore-helper.h delete mode 100644 include/asm-h8300/semaphore-helper.h delete mode 100644 include/asm-m68k/semaphore-helper.h delete mode 100644 include/asm-m68knommu/semaphore-helper.h delete mode 100644 include/asm-parisc/semaphore-helper.h delete mode 100644 include/asm-sh/semaphore-helper.h delete mode 100644 include/asm-x86/semaphore_32.h delete mode 100644 include/asm-x86/semaphore_64.h create mode 100644 include/linux/semaphore.h create mode 100644 kernel/semaphore.c delete mode 100644 lib/semaphore-sleepers.c