1. 21 8月, 2012 16 次提交
    • L
      Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 10c63c9a
      Linus Torvalds 提交于
      Pull more USB patches from Greg Kroah-Hartman:
       "Here are 10 more USB patches for 3.6-rc3.  They all fix reported
        problems (build problems for one of them, and easily repeatable oopses
        for the others.)
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        gpu/mfd/usb: Fix USB randconfig problems
        USB: CDC ACM: Fix NULL pointer dereference
        USB: emi62: remove __devinit* from the struct usb_device_id table
        USB: winbond: remove __devinit* from the struct usb_device_id table
        USB: vt6656: remove __devinit* from the struct usb_device_id table
        USB: rtl8187: remove __devinit* from the struct usb_device_id table
        USB: p54usb: remove __devinit* from the struct usb_device_id table
        USB: spca506: remove __devinit* from the struct usb_device_id table
        USB: jl2005bcd: remove __devinit* from the struct usb_device_id table
        USB: smsusb: remove __devinit* from the struct usb_device_id table
      10c63c9a
    • L
      Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · c3e2f79d
      Linus Torvalds 提交于
      Pull one more driver core fix from Greg Kroah-Hartman:
       "Here is one fix for the dmesg line corruption problem that the
        previous set of patches caused.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        dyndbg: fix for SOH in logging messages
      c3e2f79d
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · b0fbfb0c
      Linus Torvalds 提交于
      Pull x86 platform driver update from Matthew Garrett:
       "Some small updates for a few drivers, and some hardware enablement for
        new Ideapads and the gmux hardware in the latest Macs.
      
        This code won't run on older devices and has been well tested on new
        ones, so low risk of regressions."
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
        ideapad: add Lenovo IdeaPad Z570 support (part 3)
        ideapad: add Lenovo IdeaPad Z570 support (part 2)
        ideapad: add Lenovo IdeaPad Z570 support (part 1)
        classmate-laptop: always call input_sync() after input_report_switch()
        thinkpad-acpi: recognize latest V-Series using DMI_BIOS_VENDOR
        dell-laptop: Fixed typo in touchpad LED quirk
        vga_switcheroo: Don't require handler init callback
        vga_switcheroo: Remove assumptions about registration/unregistration ordering
        apple-gmux: Add display mux support
        apple-gmux: Fix kconfig dependencies
        asus-wmi: record wlan status while controlled by userapp
        apple_gmux: Fix ACPI video unregister
        apple_gmux: Add support for newer hardware
        gmux: Add generic write32 function
      b0fbfb0c
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 807b5169
      Linus Torvalds 提交于
      Pull a hwmon fix from Guenter Roeck:
       "One patch with section conflict fixes."
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        sections: Fix section conflicts in drivers/hwmon
      807b5169
    • L
      Merge tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc · 8a6b5214
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "Grant is still away so another pull request with some fairly minor
        fixes, the most notable of which are several fixes for some common
        error patterns with the reference counting spi_master_get/put do."
      
      * tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
        spi/coldfire-qspi: Drop extra calls to spi_master_get in suspend/resume functions
        spi: spi-coldfire-qspi: Drop extra spi_master_put in device remove function
        spi/pl022: fix spi-pl022 pm enable at probe
        spi/bcm63xx: Ensure that memory is freed only after it is no longer used
        spi: omap2-mcspi: Fix the error handling in probe
        spi/s3c64xx: Add missing static storage class specifiers
      8a6b5214
    • L
      Merge tag 'regulator-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · fd4d3328
      Linus Torvalds 提交于
      Pull regulator fixes from Mark Brown:
       "A bunch of fixes which are a combination of minor fixes that have been
        shaken down due to greater testing exposure, the biggest block of
        which are for the Palmas driver which hadn't had all the changes
        required for mainline properly tested when it was merged."
      
      * tag 'regulator-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: twl-regulator: fix up VINTANA1/VINTANA2
        regulator: core: request only valid gpio pins for regulator enable
        regulator: twl: Remove references to the twl4030 regulator
        regulator: gpio-regulator: Split setting of voltages and currents
        regulator: ab3100: add missing voltage table
        regulator: anatop: Fix wrong mask used in anatop_get_voltage_sel
        regulator: tps6586x: correct vin pin for sm0/sm1/sm2
        regulator: palmas: Fix palmas_probe error handling
        regulator: palmas: Call palmas_ldo_[read|write] in palmas_ldo_init
        regulator: palmas: Fix regmap offsets for PALMAS_REG_SMPS10 vsel_reg
        regulator: palmas: Fix calculating selector in palmas_map_voltage_ldo
      fd4d3328
    • L
      Merge tag 'iommu-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · d408ea2a
      Linus Torvalds 提交于
      Pull IOMMU fixes from Joerg Roedel:
       "Two fixes are necessary.  One patch fixes a boot crash on MacBook Air
        with interrupt remapping enabled and the other patch fixes a
        regression (which causes a boot crash on AMD IOMMUv2 systems too) in
        the init code of the AMD IOMMU driver."
      
      * tag 'iommu-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: Fix wrong check for ARRAY_SIZE()
        irq_remap: disable IRQ remapping if any IOAPIC lacks an IOMMU
      d408ea2a
    • G
      gpu/mfd/usb: Fix USB randconfig problems · 8f057d7b
      Guenter Roeck 提交于
      Fix config warning:
      
      warning: ( ... && DRM_USB) selects USB which has unmet direct dependencies
      (USB_SUPPORT && USB_ARCH_HAS_HCD)
      
      and build error:
      ERROR: "usb_speed_string" [drivers/usb/core/usbcore.ko] undefined!
      
      by adding the missing dependency on USB_ARCH_HAS_HCD to DRM_UDL and DRM_USB.
      
      This exposes:
      drivers/video/Kconfig:36:error: recursive dependency detected!
      drivers/video/Kconfig:36:       symbol FB is selected by DRM_KMS_HELPER
      drivers/gpu/drm/Kconfig:28:     symbol DRM_KMS_HELPER is selected by DRM_UDL
      drivers/gpu/drm/udl/Kconfig:1:  symbol DRM_UDL depends on USB_ARCH_HAS_HCD
      drivers/usb/Kconfig:78: symbol USB_ARCH_HAS_HCD depends on USB_ARCH_HAS_OHCI
      drivers/usb/Kconfig:16: symbol USB_ARCH_HAS_OHCI depends on I2C
      drivers/i2c/Kconfig:5:  symbol I2C is selected by FB_DDC
      drivers/video/Kconfig:86:       symbol FB_DDC is selected by FB_CYBER2000_DDC
      drivers/video/Kconfig:385:      symbol FB_CYBER2000_DDC depends on FB_CYBER2000
      drivers/video/Kconfig:373:      symbol FB_CYBER2000 depends on FB
      
      which is due to drivers/usb/Kconfig:
      config USB_ARCH_HAS_OHCI
      	...
      	default y if ARCH_PNX4008 && I2C
      
      Fix by dropping I2C from the above dependency; logic is that this is not a
      platform dependency but a configuration dependency: the _architecture_ still
      supports USB even is I2C is not selected.
      
      This exposes:
      drivers/video/Kconfig:36:error: recursive dependency detected!
      drivers/video/Kconfig:36:       symbol FB is selected by DRM_KMS_HELPER
      drivers/gpu/drm/Kconfig:28:     symbol DRM_KMS_HELPER is selected by DRM_UDL
      drivers/gpu/drm/udl/Kconfig:1:  symbol DRM_UDL depends on USB_ARCH_HAS_HCD
      drivers/usb/Kconfig:78: symbol USB_ARCH_HAS_HCD depends on USB_ARCH_HAS_OHCI
      drivers/usb/Kconfig:17: symbol USB_ARCH_HAS_OHCI depends on MFD_TC6393XB
      drivers/mfd/Kconfig:396:        symbol MFD_TC6393XB depends on GPIOLIB
      drivers/gpio/Kconfig:35:        symbol GPIOLIB is selected by FB_VIA
      drivers/video/Kconfig:1560:     symbol FB_VIA depends on FB
      
      which can be fixed by having MFD_TC6393XB select GPIOLIB instead of depending on
      it.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      8f057d7b
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c71a3552
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar.
      
      A x32 socket ABI fix with a -stable backport tag among other fixes.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x32: Use compat shims for {g,s}etsockopt
        Revert "x86-64/efi: Use EFI to deal with platform wall clock"
        x86, apic: fix broken legacy interrupts in the logical apic mode
        x86, build: Globally set -fno-pic
        x86, avx: don't use avx instructions with "noxsave" boot param
      c71a3552
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 53795ced
      Linus Torvalds 提交于
      Pull scheduler fixes from Ingo Molnar.
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Fix migration thread runtime bogosity
        sched,rt: fix isolated CPUs leaving root_task_group indefinitely throttled
        sched,cgroup: Fix up task_groups list
        sched: fix divide by zero at {thread_group,task}_times
        sched, cgroup: Reduce rq->lock hold times for large cgroup hierarchies
      53795ced
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f78602ab
      Linus Torvalds 提交于
      Pull x86 perf fixes from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86: disable PEBS on a guest entry.
        perf/x86: Add Intel Westmere-EX uncore support
        perf/x86: Fixes for Nehalem-EX uncore driver
        perf, x86: Fix uncore_types_exit section mismatch
      f78602ab
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · fb344389
      Linus Torvalds 提交于
      Pull a mutex fix from Ingo Molnar.
      
      Fix the fastpath_lock failure contention flag for xchg-based mutexes.
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mutex: Place lock in contended state after fastpath_lock failure
      fb344389
    • A
      vfs: missed source of ->f_pos races · 0e665d5d
      Al Viro 提交于
      compat_sys_{read,write}v() need the same "pass a copy of file->f_pos" thing
      as sys_{read,write}{,v}().
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0e665d5d
    • M
      ideapad: add Lenovo IdeaPad Z570 support (part 3) · 0c7bbeb9
      Maxim Mikityanskiy 提交于
      The patch adds support for Lenovo IdeaPad Z570 laptop. It makes all special
      keys working, adds possibility to control fan like Windows does, controls
      Touchpad Disabled LED, toggles touchpad state via keyboard controller and
      corrects touchpad behavior on resume from suspend. It is new, modified
      version of patch. Now it does not depend on psmouse and does not need patching
      of input subsystem.
      Signed-off-by: NMaxim Mikityanskiy <maxtram95@gmail.com>
      
      This is the part 3 for fan control
      Signed-off-by: NIke Panhc <ike.pan@canonical.com>
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      0c7bbeb9
    • M
      ideapad: add Lenovo IdeaPad Z570 support (part 2) · 07a4a4fc
      Maxim Mikityanskiy 提交于
      The patch adds support for Lenovo IdeaPad Z570 laptop. It makes all special
      keys working, adds possibility to control fan like Windows does, controls
      Touchpad Disabled LED, toggles touchpad state via keyboard controller and
      corrects touchpad behavior on resume from suspend. It is new, modified
      version of patch. Now it does not depend on psmouse and does not need patching
      of input subsystem.
      Signed-off-by: NMaxim Mikityanskiy <maxtram95@gmail.com>
      
      This is part 2 for touchpad toggle
      Signed-off-by: NIke Panhc <ike.pan@canonical.com>
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      07a4a4fc
    • M
      ideapad: add Lenovo IdeaPad Z570 support (part 1) · 296f9fe0
      Maxim Mikityanskiy 提交于
      The patch adds support for Lenovo IdeaPad Z570 laptop. It makes all special
      keys working, adds possibility to control fan like Windows does, controls
      Touchpad Disabled LED, toggles touchpad state via keyboard controller and
      corrects touchpad behavior on resume from suspend. It is new, modified
      version of patch. Now it does not depend on psmouse and does not need patching
      of input subsystem.
      Signed-off-by: NMaxim Mikityanskiy <maxtram95@gmail.com>
      
      This is part 1 for special button handling.
      Signed-off-by: NIke Panhc <ike.pan@canonical.com>
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      296f9fe0
  2. 19 8月, 2012 16 次提交
  3. 18 8月, 2012 8 次提交