1. 30 10月, 2010 32 次提交
  2. 29 10月, 2010 8 次提交
    • L
      Merge branch 'stable/xen-pcifront-0.8.2' of... · 18cb657c
      Linus Torvalds 提交于
      Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
        and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
      
      * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
        xen: register xen pci notifier
        xen: initialize cpu masks for pv guests in xen_smp_init
        xen: add a missing #include to arch/x86/pci/xen.c
        xen: mask the MTRR feature from the cpuid
        xen: make hvc_xen console work for dom0.
        xen: add the direct mapping area for ISA bus access
        xen: Initialize xenbus for dom0.
        xen: use vcpu_ops to setup cpu masks
        xen: map a dummy page for local apic and ioapic in xen_set_fixmap
        xen: remap MSIs into pirqs when running as initial domain
        xen: remap GSIs as pirqs when running as initial domain
        xen: introduce XEN_DOM0 as a silent option
        xen: map MSIs into pirqs
        xen: support GSI -> pirq remapping in PV on HVM guests
        xen: add xen hvm acpi_register_gsi variant
        acpi: use indirect call to register gsi in different modes
        xen: implement xen_hvm_register_pirq
        xen: get the maximum number of pirqs from xen
        xen: support pirq != irq
      
      * 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
        X86/PCI: Remove the dependency on isapnp_disable.
        xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
        MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
        x86: xen: Sanitse irq handling (part two)
        swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
        MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
        xen/pci: Request ACS when Xen-SWIOTLB is activated.
        xen-pcifront: Xen PCI frontend driver.
        xenbus: prevent warnings on unhandled enumeration values
        xenbus: Xen paravirtualised PCI hotplug support.
        xen/x86/PCI: Add support for the Xen PCI subsystem
        x86: Introduce x86_msi_ops
        msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
        x86/PCI: Export pci_walk_bus function.
        x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
        x86/PCI: Clean up pci_cache_line_size
        xen: fix shared irq device passthrough
        xen: Provide a variant of xen_poll_irq with timeout.
        xen: Find an unbound irq number in reverse order (high to low).
        xen: statically initialize cpu_evtchn_mask_p
        ...
      
      Fix up trivial conflicts in drivers/pci/Makefile
      18cb657c
    • L
      Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 2301b65b
      Linus Torvalds 提交于
      * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        scripts/package: don't break if %{_smp_mflags} isn't set
        kbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it
      2301b65b
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · e596c790
      Linus Torvalds 提交于
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (39 commits)
        Revert "namespace: add source file location exceptions"
        Coccinelle: Add contextual message
        Coccinelle: Fix documentation
        Coccinelle: Find doubled arguments to boolean or bit operators.
        Coccinelle: Find nested lock+irqsave functions that use the same flags variables.
        namespace: add source file location exceptions
        scripts/extract-ikconfig: add support for bzip2, lzma and lzo
        kbuild: check return value of asprintf()
        scripts/namespace.pl: improve to get more correct results
        scripts/namespace.pl: some bug fixes
        scripts/namespace.pl: update file exclusion list
        scripts/namespace.pl: fix wrong source path
        Coccinelle: Use the -no_show_diff option for org and report mode
        Coccinelle: Add a new mode named 'chain'
        Coccinelle: Use new comment format to explain kfree.cocci
        Coccinelle: Improve user information with a new kind of comment
        Coccinelle: Update documentation
        MAINTAINERS: Coccinelle: Update email address
        Documentation/kbuild: modules.txt cleanup
        Documentation/kbuild: major edit of modules.txt sections 5-8
        ...
      e596c790
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 51399a39
      Linus Torvalds 提交于
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
        kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
        README: cite nconfig
        Revert "kconfig: Temporarily disable dependency warnings"
        kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
        kconfig: Fix realloc usage()
        kconfig: Propagate const
        kconfig: Don't go out from read config loop when you read new symbol
        kconfig: fix menuconfig on debian lenny
        kbuild: migrate all arch to the kconfig mainmenu upgrade
        kconfig: expand file names
        kconfig: use the file's name of sourced file
        kconfig: constify file name
        kconfig: don't emit warning upon rootmenu's prompt redefinition
        kconfig: replace KERNELVERSION usage by the mainmenu's prompt
        kconfig: delay gconf window initialization
        kconfig: expand by default the rootmenu's prompt
        kconfig: add a symbol string expansion helper
        kconfig: regen parser
        kconfig: implement the `mainmenu' directive
        kconfig: allow PACKAGE to be defined on the compiler's command-line
        ...
      
      Fix up trivial conflict in arch/mn10300/Kconfig
      51399a39
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · b779b332
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (73 commits)
        power: Revert "power_supply: Mark twl4030_charger as broken"
        mfd: Fix a memory leak when unload mc13xxx-core module
        mfd: Fix resource reclaim for max8998
        mfd: Remove unneeded ret value checking for max8998 register updates
        mfd: Add free max8998->ono irq in max8998_irq_exit()
        mfd: Fix resource reclaim in pcf50633_remove()
        omap4: pandaboard: fix up mmc card detect logic
        mfd: Fix ezx_pcap_probe error path
        mfd: Fix off-by-one value range checking for tps6507x
        mfd: Remove __devinitdata from tc6393xb_mmc_resources
        mfd: Add WM831x SPI support
        mfd: Factor out WM831x I2C I/O from the core driver
        mfd: Remove DEBUG defines from mc13xxx-core
        mfd: Fix jz4740_adc_set_enabled
        mfd: Add TPS658621C device ID
        mfd: Fix twl-irq function declaration warnings
        regulator: max8998 BUCK1/2 voltage change with use of GPIOs
        mfd: Voltages and GPIOs platform_data definitions for max8998
        regulator: max8998 BUCK1/2 internal voltages and indexes defined
        mfd: Support for ICs compliant with max8998
        ...
      b779b332
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · a0cadc27
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        watchdog: iTCO_wdt.c: remove extra pci_dev_put()'s from init code
        watchdog: add support for Broadcom BCM63xx built-in watchdog
        watchdog: f71808e_wdt: add support for the F71889FG
        watchdog: MachZ: fix debug macro
        watchdog: it8712f_wdt: Add module parameter for alternative reset sources
        watchdog: it8712f_wdt: Add comments for config/control register names
        watchdog: it87_wdt: Add support for watchdogs with 8b timers
        watchdog: it87_wdt: Add support for IT8720F watchdog
        watchdog:  Use static const char * const where possible
        watchdog: iTCO_wdt: Cleanup warning messages
        watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg DeviceIDs
      a0cadc27
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 671f837a
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: BUG_ON fix: check if page has buffers before calling page_buffers()
      671f837a
    • P
      watchdog: iTCO_wdt.c: remove extra pci_dev_put()'s from init code · ad1d3a26
      Prarit Bhargava 提交于
      The iTCO_wdt driver erroneously releases the pci_dev, and causes PCI hotremove
      to fail because of an incorrect usage count.
      
      The probe for this driver does a for_each_pci_dev() which gets a reference for
      a pci_dev when iTCO_wdt_init() is successful.  The for_each_pci_dev() loop
      puts a reference for a pci_dev when iTCO_wdt_init() fails, so the
      iTCO_wdt_init() does not need to do any pci_dev_put()'s.
      
      The only pci_dev_put() that is required is in the iTCO_wdt_cleanup() function.
      Signed-off-by: NPrarit Bhargava <prarit@redhat.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      ad1d3a26