$ git checkout master Already on branch "master" $ git reset --hard stable HEAD is now at dba92d3... Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband Merging origin/master $ git merge origin/master Updating dba92d3..a978b30 Fast forward Documentation/acpi/dsdt-override.txt | 12 +-- Documentation/acpi/initramfs-add-dsdt.sh | 43 -------- Documentation/kernel-parameters.txt | 3 - MAINTAINERS | 9 ++ Makefile | 2 +- arch/parisc/Makefile | 3 + .../{defconfig => configs/default_defconfig} | 0 arch/parisc/kernel/firmware.c | 27 +++-- arch/parisc/kernel/hardware.c | 13 ++- arch/parisc/kernel/head.S | 7 +- arch/parisc/kernel/pdc_cons.c | 30 +++--- arch/parisc/kernel/syscall_table.S | 5 +- arch/parisc/kernel/traps.c | 25 ++++- drivers/acpi/Kconfig | 11 -- drivers/acpi/osl.c | 84 --------------- drivers/firewire/Kconfig | 50 ++++------ drivers/firewire/fw-ohci.c | 108 +++++++++++++++----- drivers/firewire/fw-sbp2.c | 36 ++++++- drivers/firewire/fw-topology.c | 3 +- drivers/firewire/fw-transaction.c | 2 +- drivers/firewire/fw-transaction.h | 6 +- drivers/ieee1394/sbp2.c | 5 + drivers/mmc/host/tifm_sd.c | 2 +- drivers/parisc/pdc_stable.c | 6 +- drivers/parisc/sba_iommu.c | 4 +- fs/nfsd/nfsfh.c | 4 +- include/asm-parisc/elf.h | 22 ++-- include/asm-parisc/fixmap.h | 9 ++- include/asm-parisc/futex.h | 10 ++- include/asm-parisc/pdc.h | 3 +- include/asm-parisc/pgalloc.h | 4 +- include/asm-parisc/pgtable.h | 8 -- include/asm-parisc/unistd.h | 5 +- include/linux/exportfs.h | 4 +- include/net/dst.h | 23 +++-- init/initramfs.c | 8 +-- init/main.c | 7 -- kernel/sched.c | 44 ++++----- kernel/sched_fair.c | 86 +++++++++++----- 39 files changed, 371 insertions(+), 362 deletions(-) delete mode 100755 Documentation/acpi/initramfs-add-dsdt.sh rename arch/parisc/{defconfig => configs/default_defconfig} (100%) Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged MAINTAINERS Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged init/main.c Merge made by recursive. 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 | 8 +- drivers/base/class.c | 640 +-------- drivers/base/core.c | 35 +- 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/media/video/Kconfig | 1 + drivers/media/video/Makefile | 2 + drivers/media/video/go7007/Kconfig | 14 + drivers/media/video/go7007/Makefile | 17 + drivers/media/video/go7007/go7007-driver.c | 693 +++++++++ drivers/media/video/go7007/go7007-fw.c | 1643 ++++++++++++++++++++ drivers/media/video/go7007/go7007-i2c.c | 309 ++++ drivers/media/video/go7007/go7007-priv.h | 279 ++++ drivers/media/video/go7007/go7007-usb.c | 1229 +++++++++++++++ drivers/media/video/go7007/go7007-v4l2.c | 1516 ++++++++++++++++++ drivers/media/video/go7007/go7007.h | 120 ++ drivers/media/video/go7007/saa7134-go7007.c | 484 ++++++ drivers/media/video/go7007/snd-go7007.c | 315 ++++ drivers/media/video/go7007/wis-i2c.h | 55 + drivers/media/video/go7007/wis-ov7640.c | 146 ++ drivers/media/video/go7007/wis-saa7113.c | 378 +++++ drivers/media/video/go7007/wis-saa7115.c | 507 ++++++ drivers/media/video/go7007/wis-sony-tuner.c | 757 +++++++++ drivers/media/video/go7007/wis-tw2804.c | 383 +++++ drivers/media/video/go7007/wis-tw9903.c | 378 +++++ drivers/media/video/go7007/wis-uda1342.c | 136 ++ 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/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/file.c | 21 +- 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 | 112 +-- 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 | 65 +- 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 +- 134 files changed, 12044 insertions(+), 2868 deletions(-) create mode 100644 drivers/media/video/go7007/Kconfig create mode 100644 drivers/media/video/go7007/Makefile create mode 100644 drivers/media/video/go7007/go7007-driver.c create mode 100644 drivers/media/video/go7007/go7007-fw.c create mode 100644 drivers/media/video/go7007/go7007-i2c.c create mode 100644 drivers/media/video/go7007/go7007-priv.h create mode 100644 drivers/media/video/go7007/go7007-usb.c create mode 100644 drivers/media/video/go7007/go7007-v4l2.c create mode 100644 drivers/media/video/go7007/go7007.h create mode 100644 drivers/media/video/go7007/saa7134-go7007.c create mode 100644 drivers/media/video/go7007/snd-go7007.c create mode 100644 drivers/media/video/go7007/wis-i2c.h create mode 100644 drivers/media/video/go7007/wis-ov7640.c create mode 100644 drivers/media/video/go7007/wis-saa7113.c create mode 100644 drivers/media/video/go7007/wis-saa7115.c create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c create mode 100644 drivers/media/video/go7007/wis-tw2804.c create mode 100644 drivers/media/video/go7007/wis-tw9903.c create mode 100644 drivers/media/video/go7007/wis-uda1342.c create mode 100644 drivers/uio/uio_smx.c rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) Apply scsi-convert-struct-class_device-to-struct-device-fi.patch Merging quilt/pci $ git merge quilt/pci Auto-merged Documentation/00-INDEX Auto-merged Documentation/kernel-parameters.txt Auto-merged drivers/pci/bus.c Auto-merged include/linux/pci.h Merge made by recursive. Documentation/00-INDEX | 10 - Documentation/ABI/testing/sysfs-bus-pci | 11 + Documentation/PCI/00-INDEX | 12 + Documentation/{ => PCI}/PCIEBUS-HOWTO.txt | 12 +- Documentation/{ => PCI}/pci-error-recovery.txt | 0 Documentation/{ => PCI}/pci.txt | 2 +- Documentation/{ => PCI}/pcieaer-howto.txt | 2 +- Documentation/ide/ide.txt | 2 - Documentation/kernel-parameters.txt | 10 +- Documentation/memory-barriers.txt | 4 +- arch/alpha/kernel/pci.c | 23 +- arch/arm/kernel/bios32.c | 27 +- arch/cris/arch-v32/drivers/pci/bios.c | 34 +- arch/frv/mb93090-mb00/pci-frv.c | 32 - arch/frv/mb93090-mb00/pci-frv.h | 3 - arch/frv/mb93090-mb00/pci-vdk.c | 55 +-- arch/ia64/pci/pci.c | 44 +-- arch/mips/pci/pci.c | 40 +-- arch/mn10300/unit-asb2305/pci-asb2305.c | 39 -- arch/mn10300/unit-asb2305/pci-asb2305.h | 3 - arch/mn10300/unit-asb2305/pci.c | 2 +- arch/parisc/kernel/pci.c | 30 +- arch/powerpc/kernel/pci-common.c | 34 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- arch/ppc/kernel/pci.c | 59 +-- arch/sh/drivers/pci/pci-sh4.h | 2 - arch/sh/drivers/pci/pci.c | 29 +- arch/sparc64/kernel/pci.c | 27 +- arch/v850/kernel/rte_mb_a_pci.c | 25 +- arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/pci/acpi.c | 11 +- arch/x86/pci/common.c | 63 +-- arch/x86/pci/i386.c | 38 -- arch/x86/pci/pcbios.c | 72 --- arch/x86/pci/pci.h | 4 - arch/xtensa/kernel/pci.c | 57 +-- drivers/ide/Kconfig | 9 +- drivers/ide/ide-scan-pci.c | 9 +- drivers/ide/ide.c | 12 - drivers/parisc/dino.c | 1 - drivers/pci/access.c | 165 +++++ 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, 2152 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 Merge made by recursive. Documentation/usb/persist.txt | 43 +- 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 | 8 +- drivers/usb/core/Kconfig | 38 +- 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 | 15 +- drivers/usb/core/quirks.c | 17 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - 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 | 22 +- 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/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 | 9 + drivers/usb/image/Makefile | 1 + drivers/usb/image/f2255usb.h |40334 ++++++++++++++++++++++++++++++++ drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/image/s2255drv.c | 2802 +++ drivers/usb/misc/Kconfig | 9 + 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/serial/Kconfig | 10 + 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 | 2 +- drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 10 +- drivers/usb/storage/transport.c | 20 +- drivers/usb/storage/usb.c | 16 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 166 +- include/linux/usb/ch9.h | 14 +- include/linux/usb/quirks.h | 3 + 134 files changed, 47609 insertions(+), 2989 deletions(-) create mode 100644 drivers/usb/image/f2255usb.h create mode 100644 drivers/usb/image/s2255drv.c create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/spcp8x5.c Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging hid/mm $ git merge hid/mm Merge made by recursive. drivers/hid/hid-core.c | 2 +- drivers/hid/hid-input-quirks.c | 22 +++- drivers/hid/usbhid/hid-core.c | 42 ++++--- drivers/hid/usbhid/hid-quirks.c | 54 ++++++++ drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- include/linux/hid.h | 5 +- 6 files changed, 255 insertions(+), 156 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Removed drivers/i2c/algos/i2c-algo-pca.h Auto-merged drivers/i2c/i2c-core.c Merge made by recursive. 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 | 11 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++--- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 ++++++++++++++++++++++++++++++++++++++ drivers/i2c/chips/isp1301_omap.c | 87 +++--- drivers/i2c/i2c-core.c | 2 +- drivers/i2c/i2c-dev.c | 329 +++++++++++----------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- 18 files changed, 1164 insertions(+), 403 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h Merging quilt/kernel-doc $ git merge quilt/kernel-doc Auto-merged Documentation/00-INDEX 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 Auto-merged drivers/media/video/Kconfig Auto-merged drivers/media/video/Makefile Merge made by recursive. Documentation/video4linux/CARDLIST.bttv | 2 + Documentation/video4linux/CARDLIST.cx88 | 7 + 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 | 8 +- 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/opera1.c | 2 +- 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/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 19 +- drivers/media/dvb/frontends/tda18271-fe.c | 230 +-- drivers/media/dvb/frontends/tda18271-priv.h | 7 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 8 +- 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-typhoon.c | 2 +- drivers/media/video/Kconfig | 49 +- 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 | 53 + 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-dvb.c | 2 +- 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 | 460 +++++- drivers/media/video/cx88/cx88-core.c | 6 +- drivers/media/video/cx88/cx88-dvb.c | 165 ++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 2 +- 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 | 19 +- drivers/media/video/cx88/cx88.h | 7 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-core.c | 26 +- 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 | 51 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-firmware.c | 8 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- 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 | 50 + 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 | 364 ++++- drivers/media/video/saa7134/saa7134-core.c | 48 +- drivers/media/video/saa7134/saa7134-dvb.c | 122 ++- 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-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 6 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 10 +- drivers/media/video/saa7134/saa7134.h | 16 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 2 +- 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 | 3 +- 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 | 44 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 800 +++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 184 ++- drivers/media/video/tuner-xc2028.c | 18 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 6 +- 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 | 11 +- 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 | 1711 +++++++++++--------- drivers/media/video/videobuf-core.c | 2 + 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/soc_camera.h | 173 ++ include/media/tuner-types.h | 17 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-dma-sg.h | 14 +- 201 files changed, 8734 insertions(+), 2224 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 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/topology.c | 315 +++++++++++++++++++++++++++++++++++ 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/crypto/zcrypt_api.c | 120 +++++++++++++ drivers/s390/crypto/zcrypt_api.h | 8 + drivers/s390/crypto/zcrypt_pcixcc.c | 199 ++++++++++++++++++++++- drivers/s390/sysinfo.c | 23 +++- 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/system.h | 13 ++ include/asm-s390/tlbflush.h | 1 + include/asm-s390/topology.h | 25 +++ include/linux/hugetlb.h | 22 +++ include/linux/sched.h | 1 + include/linux/topology.h | 2 + kernel/sched.c | 7 +- mm/hugetlb.c | 37 +++-- 40 files changed, 1346 insertions(+), 87 deletions(-) create mode 100644 arch/s390/kernel/topology.c create mode 100644 arch/s390/mm/hugetlbpage.c Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 11 +- arch/sh/Kconfig.debug | 13 +- arch/sh/boards/renesas/migor/setup.c | 56 +++++++- arch/sh/boards/se/7722/setup.c | 41 +++++ 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/setup.c | 15 ++ arch/sh/mm/cache-debugfs.c | 4 +- arch/sh/mm/pmb.c | 2 +- drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/sh_keysc.c | 281 ++++++++++++++++++++++++++++++++ drivers/rtc/rtc-sh.c | 296 +++++++++++++++++++++------------- include/asm-sh/bugs.h | 2 +- include/asm-sh/processor.h | 2 +- include/asm-sh/se7722.h | 2 + include/asm-sh/sh_keysc.h | 13 ++ include/asm-sh/system.h | 2 + 19 files changed, 802 insertions(+), 126 deletions(-) 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/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 Auto-merged include/linux/Kbuild Removed include/linux/hdsmart.h Auto-merged include/linux/ide.h Recorded preimage for 'Documentation/ide/ide.txt' Recorded preimage for 'Documentation/kernel-parameters.txt' Automatic merge failed; fix conflicts and then commit the result. Fix up merge conflicts $ git commit -v -a Created commit d687418: Merge branch 'quilt/ide' $ git diff -M --stat --summary HEAD^.. Documentation/ide/ide.txt | 71 +-- Documentation/ide/warm-plug-howto.txt | 13 + Documentation/kernel-parameters.txt | 4 - 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 | 17 +- drivers/ide/arm/icside.c | 58 ++- drivers/ide/arm/ide_arm.c | 20 +- drivers/ide/arm/palm_bk3710.c | 58 ++- drivers/ide/arm/rapide.c | 5 +- drivers/ide/cris/ide-cris.c | 53 ++- drivers/ide/h8300/ide-h8300.c | 4 +- drivers/ide/ide-acpi.c | 14 +- drivers/ide/ide-cd.c | 923 +++++++++++++---------------- drivers/ide/ide-cd.h | 4 - drivers/ide/ide-disk.c | 159 +++--- drivers/ide/ide-dma.c | 153 +---- 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 | 54 +- drivers/ide/ide-pnp.c | 42 +- drivers/ide/ide-probe.c | 359 +++++++++--- drivers/ide/ide-proc.c | 180 +++---- drivers/ide/ide-scan-pci.c | 2 +- drivers/ide/ide-tape.c | 852 +++++++++------------------ drivers/ide/ide-taskfile.c | 48 +- drivers/ide/ide.c | 669 ++++----------------- drivers/ide/legacy/Makefile | 1 + drivers/ide/legacy/ali14xx.c | 28 +- drivers/ide/legacy/buddha.c | 4 +- drivers/ide/legacy/dtc2278.c | 24 +- drivers/ide/legacy/falconide.c | 8 +- drivers/ide/legacy/gayle.c | 4 +- drivers/ide/legacy/hd.c | 78 ++-- drivers/ide/legacy/ht6560b.c | 49 +- drivers/ide/legacy/ide-4drives.c | 72 +++ drivers/ide/legacy/ide-cs.c | 82 ++- drivers/ide/legacy/ide_platform.c | 8 +- drivers/ide/legacy/macide.c | 4 +- drivers/ide/legacy/q40ide.c | 3 +- drivers/ide/legacy/qd65xx.c | 192 +++---- drivers/ide/legacy/qd65xx.h | 1 - drivers/ide/legacy/umc8672.c | 78 ++-- drivers/ide/mips/au1xxx-ide.c | 128 ++--- drivers/ide/mips/swarm.c | 13 +- drivers/ide/pci/aec62xx.c | 37 +- drivers/ide/pci/alim15x3.c | 90 ++-- drivers/ide/pci/amd74xx.c | 17 +- drivers/ide/pci/atiixp.c | 29 +- drivers/ide/pci/cmd640.c | 258 +++++---- drivers/ide/pci/cmd64x.c | 137 +++-- drivers/ide/pci/cs5520.c | 29 +- drivers/ide/pci/cs5530.c | 18 +- drivers/ide/pci/cs5535.c | 24 +- drivers/ide/pci/cy82c693.c | 93 ++-- drivers/ide/pci/delkin_cb.c | 17 +- drivers/ide/pci/generic.c | 10 +- drivers/ide/pci/hpt34x.c | 17 +- drivers/ide/pci/hpt366.c | 178 +++---- drivers/ide/pci/it8213.c | 34 +- drivers/ide/pci/it821x.c | 52 ++- drivers/ide/pci/jmicron.c | 29 +- drivers/ide/pci/ns87415.c | 28 +- drivers/ide/pci/opti621.c | 75 ++-- drivers/ide/pci/pdc202xx_new.c | 23 +- drivers/ide/pci/pdc202xx_old.c | 120 ++-- drivers/ide/pci/piix.c | 17 +- drivers/ide/pci/rz1000.c | 2 +- drivers/ide/pci/sc1200.c | 37 +- drivers/ide/pci/scc_pata.c | 75 ++-- drivers/ide/pci/serverworks.c | 38 +- drivers/ide/pci/sgiioc4.c | 123 ++--- drivers/ide/pci/siimage.c | 142 ++--- 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 | 41 +- drivers/ide/pci/via82cxxx.c | 18 +- drivers/ide/ppc/mpc8xx.c | 134 ++--- 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 | 312 ++++++----- 138 files changed, 3959 insertions(+), 5496 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 Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/nfs/client.c | 2 + fs/nfs/direct.c | 9 +- fs/nfs/inode.c | 43 +++++++- fs/nfs/internal.h | 1 + fs/nfs/nfs4proc.c | 10 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/read.c | 16 +-- fs/nfs/write.c | 63 +++++----- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/auth_gss/auth_gss.c | 5 +- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 255 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 16 files changed, 281 insertions(+), 243 deletions(-) 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_kernel.h 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 include/rdma/ib_verbs.h Recorded preimage for 'drivers/infiniband/hw/amso1100/c2_provider.c' Recorded preimage for 'drivers/infiniband/hw/cxgb3/iwch_provider.c' Recorded preimage for 'drivers/infiniband/hw/nes/nes_verbs.c' Automatic merge failed; fix conflicts and then commit the result. Fix up merge conflicts $ git commit -v -a Created commit 02374a2: Merge commit 'infiniband/for-next' $ 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_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 | 8 +- drivers/infiniband/hw/amso1100/c2_rnic.c | 28 ++-- 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 | 78 +++++----- drivers/infiniband/hw/cxgb3/iwch_provider.h | 4 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 38 +++--- drivers/infiniband/hw/ehca/ehca_tools.h | 16 +- drivers/infiniband/hw/ipath/ipath_driver.c | 4 +- drivers/infiniband/hw/ipath/ipath_init_chip.c | 8 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 2 +- drivers/infiniband/hw/mlx4/cq.c | 16 ++ drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 2 + drivers/infiniband/hw/mlx4/qp.c | 7 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- 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_memfree.c | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- drivers/infiniband/hw/nes/nes.c | 9 +- drivers/infiniband/hw/nes/nes.h | 15 +-- drivers/infiniband/hw/nes/nes_cm.c | 20 ++-- drivers/infiniband/hw/nes/nes_hw.c | 14 +- drivers/infiniband/hw/nes/nes_nic.c | 2 +- drivers/infiniband/hw/nes/nes_utils.c | 2 +- drivers/infiniband/hw/nes/nes_verbs.c | 7 +- 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/net/mlx4/cmd.c | 3 +- drivers/net/mlx4/fw.c | 4 + include/linux/mlx4/cq.h | 14 ++- include/linux/mlx4/qp.h | 10 +- include/rdma/ib_verbs.h | 2 +- 61 files changed, 667 insertions(+), 581 deletions(-) Merging acpi/test $ git merge acpi/test Removed arch/x86/kernel/acpi/sleep_32.c Merge made by recursive. 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/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/asus_acpi.c | 2 +- include/asm-x86/smp_64.h | 2 - include/asm-x86/trampoline.h | 18 ++ 33 files changed, 727 insertions(+), 777 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 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 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/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 | 114 +++++++------- drivers/firewire/fw-sbp2.c | 150 ++++++++--------- drivers/firewire/fw-topology.c | 3 + drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 11 +- 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 | 111 ++++++------- drivers/ieee1394/pcilynx.c | 12 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 + 22 files changed, 487 insertions(+), 346 deletions(-) Merging hwmon/testing $ git merge hwmon/testing Merge made by recursive. Documentation/hwmon/w83l785ts | 3 ++- drivers/hwmon/asb100.c | 4 ---- 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 ++-- 19 files changed, 105 insertions(+), 26 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/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 | 10 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/kvmclock.c | 160 ++++++++++ arch/x86/kernel/setup_32.c | 5 + arch/x86/kernel/setup_64.c | 5 + 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 | 417 +++++++++++++++++++++----- 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 | 229 +++++++++++---- arch/x86/kvm/vmx.c | 135 +++++++-- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 344 +++++++++++++++++----- arch/x86/kvm/x86_emulate.c | 256 +++++++++------- include/asm-x86/kvm.h | 21 ++ include/asm-x86/kvm_host.h | 40 ++- include/asm-x86/kvm_para.h | 25 ++ include/linux/kvm.h | 7 + include/linux/kvm_host.h | 14 +- virt/kvm/kvm_main.c | 91 +++++- 26 files changed, 2121 insertions(+), 432 deletions(-) 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 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 Auto-merged drivers/scsi/scsi_sysfs.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c Resolved 'drivers/scsi/scsi_sysfs.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit c760df8: Merge commit 'scsi-rc-fixes/master' $ git diff -M --stat --summary HEAD^.. drivers/scsi/Kconfig | 2 +- drivers/scsi/advansys.c | 2 +- drivers/scsi/scsi_sysfs.c | 2 +- drivers/usb/storage/isd200.c | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) Merging scsi/master $ git merge scsi/master Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/hptiop.c Removed drivers/scsi/scsi_debug.h Auto-merged drivers/scsi/st.c Auto-merged include/scsi/scsi_host.h Merge made by recursive. Documentation/scsi/st.txt | 12 ++- drivers/s390/scsi/zfcp_def.h | 1 - drivers/s390/scsi/zfcp_scsi.c | 64 +++----- drivers/scsi/aacraid/aachba.c | 22 ++-- 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 | 19 +- drivers/scsi/libsas/sas_scsi_host.c | 41 +++++ drivers/scsi/mac_scsi.c | 1 - drivers/scsi/ps3rom.c | 30 ++-- 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/scsi_debug.c | 72 ++++---- 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 +- include/linux/mtio.h | 1 + include/scsi/libsas.h | 2 + include/scsi/scsi_eh.h | 1 + include/scsi/scsi_host.h | 1 + 32 files changed, 585 insertions(+), 410 deletions(-) delete mode 100644 drivers/scsi/scsi_debug.h $ gitk quilt/driver-core & [1] 15583 sfr@ash:~/kernels/next/next$ git revert 2def42e139b28c9445e8736595473e63fe273023 Finished one revert. Created commit d29c204: 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/efi.c | 46 ++ 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/setup.c | 6 +- arch/ia64/kernel/time.c | 78 +++ arch/ia64/mm/tlb.c | 99 +++- include/asm-ia64/cputime.h | 104 ++++ include/asm-ia64/elf.h | 31 +- include/asm-ia64/sal.h | 17 + include/asm-ia64/system.h | 12 + include/asm-ia64/thread_info.h | 14 + include/asm-ia64/tlbflush.h | 1 + 22 files changed, 2144 insertions(+), 421 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 Created commit 6ad0a6b: Merge commit 'tests/master' $ 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 fs/Kconfig Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 11 + 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 +- 39 files changed, 5119 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/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 | 58 +++++++++++++------ 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, 168 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. arch/powerpc/Kconfig | 1 + 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/prom.c | 2 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- 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/maple/setup.c | 2 +- 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/lpar.c | 15 ++ 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/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/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 ++++++++------ 48 files changed, 966 insertions(+), 280 deletions(-) create mode 100644 drivers/net/pasemi_mac_ethtool.c 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/spinlock.h | 37 --------------------- include/linux/thread_info.h | 12 +++++++ kernel/compat.c | 15 ++++---- kernel/hrtimer.c | 22 ++++++------- kernel/posix-cpu-timers.c | 30 ++++++++-------- kernel/time/tick-sched.c | 6 +-- kernel/timer.c | 16 ++------- kernel/workqueue.c | 2 + 13 files changed, 54 insertions(+), 94 deletions(-) rename Documentation/{hrtimers => timers}/highres.txt (100%) rename Documentation/{hrtimers => timers}/hrtimers.txt (100%) rename Documentation/{hrtimer => timers}/timer_stats.txt (100%) 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(-) Applying really export empty_zero_page 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 Auto-merged crypto/async_tx/async_tx.c Auto-merged drivers/dma/dmaengine.c Auto-merged drivers/dma/fsldma.c Auto-merged drivers/dma/iop-adma.c Merge made by recursive. crypto/async_tx/async_tx.c | 197 ++++++++++++++++++++++++++------ drivers/dma/dmaengine.c | 3 - drivers/dma/fsldma.c | 8 -- drivers/dma/ioat_dma.c | 12 -- drivers/dma/iop-adma.c | 21 +--- include/asm-arm/arch-iop13xx/adma.h | 5 - include/asm-arm/hardware/iop3xx-adma.h | 8 -- include/asm-arm/hardware/iop_adma.h | 2 - include/linux/dmaengine.h | 11 +-- 9 files changed, 170 insertions(+), 97 deletions(-) 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 drivers/net/wireless/libertas/cmdresp.c Removed drivers/net/wireless/rt2x00/rt2x00ring.h Auto-merged drivers/net/wireless/rt2x00/rt61pci.c Auto-merged drivers/net/wireless/rt2x00/rt73usb.c Auto-merged include/net/ipv6.h Auto-merged net/ipv4/tcp_output.c Removed net/mac80211/regdomain.c Auto-merged net/netlink/af_netlink.c Auto-merged net/sctp/ipv6.c Auto-merged net/sctp/protocol.c Auto-merged net/sctp/socket.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/clnt.c Auto-merged net/sunrpc/rpcb_clnt.c Auto-merged net/sunrpc/xprtsock.c Merge made by recursive. Documentation/DocBook/Makefile | 3 +- Documentation/DocBook/mac80211.tmpl | 335 +++++ drivers/net/bonding/bond_main.c | 8 +- drivers/net/cxgb3/l2t.c | 2 +- drivers/net/niu.c | 701 ++++++++- drivers/net/niu.h | 4 +- drivers/net/via-velocity.c | 23 +- drivers/net/wan/cosa.c | 14 +- drivers/net/wireless/Kconfig | 44 +- 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 | 613 ++++---- drivers/net/wireless/ath5k/hw.h | 150 ++- drivers/net/wireless/ath5k/initvals.c | 239 +++- drivers/net/wireless/ath5k/phy.c | 262 +++- 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 | 624 ++++++--- drivers/net/wireless/b43/main.h | 8 +- drivers/net/wireless/b43/sysfs.c | 89 +-- 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/ipw2200.c | 4 +- drivers/net/wireless/iwlwifi/Kconfig | 22 +- drivers/net/wireless/iwlwifi/Makefile | 3 + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 59 +- drivers/net/wireless/iwlwifi/iwl-3945-core.h | 80 + drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 17 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 175 --- drivers/net/wireless/iwlwifi/iwl-3945-io.h | 39 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 148 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 6 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 413 +++++- drivers/net/wireless/iwlwifi/iwl-3945.h | 57 +- drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 77 +- drivers/net/wireless/iwlwifi/iwl-4965-debug.h | 16 + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 176 --- drivers/net/wireless/iwlwifi/iwl-4965-io.h | 39 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 461 +++++-- drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 14 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 1161 +++++++-------- drivers/net/wireless/iwlwifi/iwl-4965.h | 152 +-- drivers/net/wireless/iwlwifi/iwl-core.c | 47 + drivers/net/wireless/iwlwifi/iwl-core.h | 84 ++ 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 | 20 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 966 +++---------- drivers/net/wireless/iwlwifi/iwl4965-base.c | 994 ++++---------- drivers/net/wireless/libertas/assoc.c | 32 +- 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 | 2 +- drivers/net/wireless/libertas/dev.h | 4 +- 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 | 576 ++++----- drivers/net/wireless/libertas/scan.h | 54 +- drivers/net/wireless/libertas/types.h | 13 + 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/rt2x00/Kconfig | 62 +- drivers/net/wireless/rt2x00/Makefile | 37 +- drivers/net/wireless/rt2x00/rt2400pci.c | 436 ++++--- drivers/net/wireless/rt2x00/rt2400pci.h | 8 +- drivers/net/wireless/rt2x00/rt2500pci.c | 442 ++++--- drivers/net/wireless/rt2x00/rt2500pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500usb.c | 512 ++++--- drivers/net/wireless/rt2x00/rt2500usb.h | 9 +- drivers/net/wireless/rt2x00/rt2x00.h | 339 +++-- drivers/net/wireless/rt2x00/rt2x00config.c | 163 ++- drivers/net/wireless/rt2x00/rt2x00debug.c | 124 ++- drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 907 +++++------- drivers/net/wireless/rt2x00/rt2x00dump.h | 8 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 43 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 217 +++ drivers/net/wireless/rt2x00/rt2x00leds.h | 63 + drivers/net/wireless/rt2x00/rt2x00lib.h | 101 ++- drivers/net/wireless/rt2x00/rt2x00mac.c | 243 ++-- drivers/net/wireless/rt2x00/rt2x00pci.c | 286 ++-- drivers/net/wireless/rt2x00/rt2x00pci.h | 67 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 299 ++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 457 ++++++ 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 | 324 +++-- drivers/net/wireless/rt2x00/rt2x00usb.h | 161 ++- drivers/net/wireless/rt2x00/rt61pci.c | 640 +++++---- drivers/net/wireless/rt2x00/rt61pci.h | 33 +- drivers/net/wireless/rt2x00/rt73usb.c | 521 ++++--- 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/qeth_main.c | 3 + drivers/ssb/Kconfig | 9 + drivers/ssb/Makefile | 1 + 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 | 48 +- drivers/ssb/pci.c | 28 + drivers/ssb/pcmcia.c | 32 + drivers/ssb/ssb_private.h | 2 + include/linux/icmpv6.h | 11 +- include/linux/ieee80211.h | 35 + include/linux/if_arp.h | 6 + include/linux/inetdevice.h | 2 +- include/linux/nl80211.h | 218 +++- include/linux/skbuff.h | 5 +- include/linux/ssb/ssb.h | 17 + 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/udp.h | 1 + include/linux/wireless.h | 1 + include/linux/xfrm.h | 3 +- include/net/addrconf.h | 28 +- include/net/cfg80211.h | 159 ++- include/net/icmp.h | 2 +- include/net/inet_sock.h | 2 +- include/net/ip6_fib.h | 18 +- include/net/ip6_route.h | 30 +- include/net/ipv6.h | 15 +- 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/request_sock.h | 3 +- include/net/sctp/sctp.h | 5 - include/net/sctp/structs.h | 8 + include/net/sock.h | 13 + include/net/tcp.h | 10 +- include/net/tipc/tipc_bearer.h | 9 + include/net/tipc/tipc_port.h | 7 - include/net/wireless.h | 168 +++ include/net/xfrm.h | 52 +- 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_mcast.c | 37 +- net/core/dst.c | 3 - net/core/neighbour.c | 7 +- net/core/netpoll.c | 6 +- net/core/sock.c | 21 +- net/dccp/dccp.h | 6 +- net/dccp/ipv4.c | 18 +- net/dccp/ipv6.c | 38 +- net/dccp/minisocks.c | 2 +- net/decnet/af_decnet.c | 21 +- net/ieee80211/softmac/ieee80211softmac_priv.h | 2 +- net/ipv4/af_inet.c | 14 +- net/ipv4/arp.c | 13 +- net/ipv4/devinet.c | 21 +- net/ipv4/icmp.c | 111 +- net/ipv4/igmp.c | 41 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_gre.c | 4 +- net/ipv4/ip_input.c | 2 +- net/ipv4/ip_options.c | 19 +- net/ipv4/ip_output.c | 10 +- net/ipv4/ip_sockglue.c | 2 +- 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/route.c | 97 +- net/ipv4/syncookies.c | 11 +- net/ipv4/tcp_cubic.c | 35 +- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_ipv4.c | 35 +- net/ipv4/tcp_minisocks.c | 4 +- net/ipv4/tcp_output.c | 1 + net/ipv4/udplite.c | 4 +- net/ipv6/Makefile | 1 + net/ipv6/addrconf.c | 198 ++-- net/ipv6/addrlabel.c | 19 +- net/ipv6/af_inet6.c | 175 ++- net/ipv6/anycast.c | 2 +- net/ipv6/fib6_rules.c | 103 +- net/ipv6/icmp.c | 133 ++- net/ipv6/ip6_fib.c | 292 +++-- net/ipv6/ip6_input.c | 5 - net/ipv6/ip6_output.c | 14 +- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/ipv6_sockglue.c | 125 +-- net/ipv6/mcast.c | 178 ++- net/ipv6/mip6.c | 20 +- net/ipv6/ndisc.c | 139 +- 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/route.c | 555 +++++--- net/ipv6/sit.c | 6 +- net/ipv6/syncookies.c | 267 ++++ net/ipv6/sysctl_net_ipv6.c | 15 +- net/ipv6/tcp_ipv6.c | 171 ++- net/ipv6/udp.c | 3 + net/ipv6/xfrm6_policy.c | 7 +- 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 | 16 + net/mac80211/Makefile | 7 +- 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 | 950 +++++++++---- 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 | 29 +- 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 | 90 +- 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/nf_conntrack_netbios_ns.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 2 +- net/netlink/af_netlink.c | 26 +- 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 | 2 +- net/sctp/input.c | 2 +- net/sctp/ipv6.c | 13 +- net/sctp/output.c | 14 +- net/sctp/outqueue.c | 17 +- net/sctp/proc.c | 20 +- net/sctp/protocol.c | 15 +- net/sctp/sm_sideeffect.c | 6 +- net/sctp/sm_statefuns.c | 12 +- net/sctp/socket.c | 14 +- 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 | 79 +- net/xfrm/xfrm_state.c | 53 +- net/xfrm/xfrm_user.c | 71 +- 374 files changed, 25392 insertions(+), 14171 deletions(-) create mode 100644 Documentation/DocBook/mac80211.tmpl create mode 100644 drivers/net/wireless/ath5k/Kconfig 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 create mode 100644 drivers/ssb/driver_gige.c create mode 100644 include/linux/ssb/ssb_driver_gige.h 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/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 Auto-merged arch/powerpc/Kconfig Auto-merged arch/powerpc/boot/Makefile Auto-merged arch/powerpc/boot/wrapper Merge made by recursive. arch/powerpc/Kconfig | 16 - 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 +++++++++ 8 files changed, 1450 insertions(+), 19 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 Auto-merged Documentation/feature-removal-schedule.txt Auto-merged Documentation/laptops/acer-wmi.txt Removed Documentation/networking/bcm43xx.txt Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS 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 Auto-merged drivers/net/wireless/rt2x00/rt61pci.c Auto-merged drivers/net/wireless/rt2x00/rt73usb.c Removed include/net/ieee80211softmac.h Removed include/net/ieee80211softmac_wx.h 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 Resolved 'MAINTAINERS' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 0ff2d19: Merge commit 'wireless/master' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 27 - Documentation/laptops/acer-wmi.txt | 2 +- Documentation/networking/bcm43xx.txt | 89 - MAINTAINERS | 15 - drivers/net/wireless/Kconfig | 1 - drivers/net/wireless/Makefile | 1 - drivers/net/wireless/ath5k/hw.c | 36 +- drivers/net/wireless/ath5k/phy.c | 10 +- drivers/net/wireless/b43/main.c | 4 +- drivers/net/wireless/b43/main.h | 3 - drivers/net/wireless/b43/wa.c | 45 +- 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/iwlwifi/Makefile | 2 +- drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 4 +- drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 2 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 4 +- drivers/net/wireless/iwlwifi/iwl-3945-io.h | 2 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 6 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +- drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 4 +- drivers/net/wireless/iwlwifi/iwl-4965-debug.h | 2 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 314 +-- drivers/net/wireless/iwlwifi/iwl-4965-io.h | 2 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 2 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 2 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 55 +- drivers/net/wireless/iwlwifi/iwl-4965.h | 6 +- drivers/net/wireless/iwlwifi/iwl-core.c | 4 +- drivers/net/wireless/iwlwifi/iwl-core.h | 10 + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 25 +- drivers/net/wireless/iwlwifi/iwl4965-base.c | 112 +- drivers/net/wireless/libertas/assoc.c | 4 +- drivers/net/wireless/libertas/debugfs.c | 169 - drivers/net/wireless/libertas/dev.h | 2 + drivers/net/wireless/libertas/scan.c | 145 +- drivers/net/wireless/libertas/scan.h | 69 +- drivers/net/wireless/libertas/wext.c | 3 + drivers/net/wireless/rndis_wlan.c | 451 ++-- drivers/net/wireless/rt2x00/Kconfig | 4 +- drivers/net/wireless/rt2x00/rt2400pci.c | 70 +- drivers/net/wireless/rt2x00/rt2400pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500pci.c | 71 +- drivers/net/wireless/rt2x00/rt2500usb.c | 97 +- drivers/net/wireless/rt2x00/rt2x00.h | 27 +- drivers/net/wireless/rt2x00/rt2x00config.c | 62 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 5 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 58 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 34 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 7 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 25 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 22 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 1 + drivers/net/wireless/rt2x00/rt2x00queue.c | 17 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 3 + drivers/net/wireless/rt2x00/rt2x00usb.c | 19 +- drivers/net/wireless/rt2x00/rt61pci.c | 100 +- drivers/net/wireless/rt2x00/rt73usb.c | 126 +- drivers/ssb/Kconfig | 6 + drivers/ssb/Makefile | 1 + drivers/ssb/main.c | 23 +- drivers/ssb/pci.c | 113 +- drivers/ssb/pcmcia.c | 518 +++- drivers/ssb/sprom.c | 133 + drivers/ssb/ssb_private.h | 17 + include/linux/ssb/ssb.h | 4 +- include/net/ieee80211.h | 1 - include/net/ieee80211softmac.h | 373 -- include/net/ieee80211softmac_wx.h | 99 - 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/mac80211/Kconfig | 19 - net/mac80211/Makefile | 2 - net/mac80211/ieee80211.c | 9 +- net/mac80211/ieee80211_rate.h | 15 - net/mac80211/rc80211_simple.c | 394 -- 119 files changed, 1493 insertions(+), 22703 deletions(-) delete mode 100644 Documentation/networking/bcm43xx.txt 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/ssb/sprom.c 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 delete mode 100644 net/mac80211/rc80211_simple.c 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