1. 10 2月, 2015 1 次提交
  2. 26 1月, 2015 17 次提交
  3. 25 1月, 2015 5 次提交
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 440e9960
      Linus Torvalds 提交于
      pULL SCSI fixes from James Bottomley:
       "This consists of four real fixes and three MAINTAINER updates.
      
        Three of the fixes are obvious (the DIX and atomic allocation are bug
        on and warn on fixes and the other is just trivial) and the ipr one is
        a bit more involved but is required because without it, the card
        double completes aborted commands and causes a kernel oops"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        MAINTAINERS: ibmvscsi driver maintainer change
        MAINTAINERS: ibmvfc driver maintainer change
        MAINTAINERS: Remove self as isci maintainer
        scsi_debug: test always evaluates to false, || should be used instead
        scsi: Avoid crashing if device uses DIX but adapter does not support it
        scsi_debug: use atomic allocation in resp_rsup_opcodes
        ipr: wait for aborted command responses
      440e9960
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · f828d5e2
      Linus Torvalds 提交于
      Pull watchdog fixes from Wim Van Sebroeck:
       "This will fix reboot issues with the imx2_wdt driver and it also drops
        some forgotten owner assignments from platform_drivers"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: drop owner assignment from platform_drivers
        watchdog: imx2_wdt: Disable power down counter on boot
        watchdog: imx2_wdt: Improve power management support.
      f828d5e2
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 0012125a
      Linus Torvalds 提交于
      Pull hwmon update from Jean Delvare:
       "This contains a single thing: a new driver for the temperature sensor
        embedded in the Intel 5500/5520/X58 chipsets.
      
        Sorry for the late request, it's been so long since I last sent a pull
        request and I've been so busy with other tasks meanwhile that I simply
        forgot about these patches.  But given that this is a new driver, it
        can't introduce any regression so I thought it could still be OK.
      
        This has been in linux-next for months now"
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro
        hwmon: (i5500_temp) Convert to module_pci_driver
        hwmon: (i5500_temp) Don't bind to disabled sensors
        hwmon: (i5500_temp) Convert to devm_hwmon_device_register_with_groups
        hwmon: (i5500_temp) New driver for the Intel 5500/5520/X58 chipsets
      0012125a
    • L
      Merge tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · af469b37
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
        - fix some race conditions caused by a regression on videobuf2
        - fix a interrupt release bug on cx23885
        - fix support for Mygica T230 and HVR4400
        - fix compilation breakage when USB is not selected on tlg2300
        - fix capabilities report on ompa3isp, soc-camera, rcar_vin and
          pvrusb2
      
      * tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] omap3isp: Correctly set QUERYCAP capabilities
        [media] cx23885: fix free interrupt bug
        [media] pvrusb2: fix missing device_caps in querycap
        [media] vb2: fix vb2_thread_stop race conditions
        [media] rcar_vin: Update device_caps and capabilities in querycap
        [media] soc-camera: fix device capabilities in multiple camera host drivers
        [media] Fix Mygica T230 support
        [media] cx23885: Split Hauppauge WinTV Starburst from HVR4400 card entry
        [media] tlg2300: Fix media dependencies
      af469b37
    • M
      dm: fix handling of multiple internal suspends · 96b26c8c
      Mikulas Patocka 提交于
      Commit ffcc3936 ("dm: enhance internal suspend and resume interface")
      attempted to handle multiple internal suspends on the same device, but
      it did that incorrectly.  When these functions are called in this order
      on the same device the device is no longer suspended, but it should be:
      	dm_internal_suspend_noflush
      	dm_internal_suspend_noflush
      	dm_internal_resume
      
      Fix this bug by maintaining an 'internal_suspend_count' and resuming
      the device when this count drops to zero.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      96b26c8c
  4. 24 1月, 2015 17 次提交