1. 06 9月, 2014 3 次提交
  2. 01 9月, 2014 1 次提交
    • C
      ata: Disabling the async PM for JMicron chip 363/361 · e6b7e41c
      Chuansheng Liu 提交于
      After enabled the PM feature that supporting async noirq(76569faa
      (PM / sleep: Asynchronous threads for resume_noirq)),
      Jay hit the system resuming issue, that one of the JMicron controller
      can not be powered up.
      
      His device tree is like below:
                   +-1c.4-[02]--+-00.0  JMicron Technology Corp. JMB363 SATA/IDE Controller
                   |            \-00.1  JMicron Technology Corp. JMB363 SATA/IDE Controller
      
      After investigation, we found the the Micron chip 363 included
      one SATA controller(0000:02:00.0) and one PATA controller(0000:02:00.1),
      these two controllers do not have parent-children relationship,
      but the PATA controller only can be powered on after the SATA controller
      has finished the powering on.
      
      If we enabled the async noirq(), then the below error is hit during noirq
      phase:
      pata_jmicron 0000:02:00.1: Refused to change power state, currently in D3
      
      Here for JMicron chip 363/361, we need forcedly to disable the async method.
      
      Bug detail: https://bugzilla.kernel.org/show_bug.cgi?id=81551Reported-by: NJay <MyMailClone@t-online.de>
      Signed-off-by: NChuansheng Liu <chuansheng.liu@intel.com>
      Acked-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Signed-off-by: NTejun Heo <tj@kernel.org>
      e6b7e41c
  3. 28 8月, 2014 2 次提交
  4. 26 8月, 2014 1 次提交
  5. 19 8月, 2014 1 次提交
  6. 18 8月, 2014 1 次提交
  7. 17 8月, 2014 3 次提交
  8. 16 8月, 2014 5 次提交
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 88ec63d6
      Linus Torvalds 提交于
      Pull more SCSI changes from James Bottomley:
       "This is a small set of updates which missed the first pull.  It's more
        msix updates, some iscsi and qla4xxx fixes, we also have some string
        null termination fixes a return value fix and a couple of pm8001
        firmware fixes.
      
        Just a note, we do have a couple of bug fixes coming under separate
        cover, but they don't have to be part of the merge window"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        iscsi class: Fix freeing of skb in get host error path
        scsi: fix u14-34f printk format warnings
        pm8001: fix pm8001_store_update_fw
        pm8001: Fix erratic calculation in update_flash
        pm8001: Update MAINTAINERS list
        libiscsi: return new error code when nop times out
        iscsi class: fix get_host_stats return code when not supported
        iscsi class: fix get_host_stats error handling
        qla4xxx: fix get_host_stats error propagation
        qla4xxx: check the return value of dma_alloc_coherent()
        scsi: qla4xxx: ql4_mbx.c: Cleaning up missing null-terminate in conjunction with strncpy
        scsi: qla4xxx: ql4_os.c: Cleaning up missing null-terminate in conjunction with strncpy
        qla4xxx: Use pci_enable_msix_exact() instead of pci_enable_msix()
        pm8001: Use pci_enable_msix_exact() instead of pci_enable_msix()
      88ec63d6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 2f39691f
      Linus Torvalds 提交于
      Pull input layer fixes from Dmitry Torokhov:
       "Second round of updates for the input subsystem.  Mostly small fixups
        to the code merged in the first round (atmel_mxt_ts, wacom) but also a
        smallish patch to xbox driver to support Xbox One controllers and a
        patch to better handle Synaptics profile sensors found in Cr-48
        Chromebooks that should not affect any other devices"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: edt-ft5x06 - remove superfluous assignment
        Input: xpad - add support for Xbox One controllers
        Input: atmel_mxt_ts - fix a few issues reported by Coverity
        Input: atmel_mxt_ts - split config update a bit
        Input: atmel_mxt_ts - simplify mxt_initialize a bit
        Input: joystick - use get_cycles on ARMv8
        Input: wacom - fix compiler warning if !CONFIG_PM
        Input: cap1106 - allow changing key mapping from userspace
        Input: synaptics - use firmware data for Cr-48
        Input: synaptics - properly initialize slots for semi-MT
        Input: MT - make slot cleanup callable outside mt_sync_frame()
        Input: atmel_mxt_ts - mXT224 DMA quirk was fixed in firmware v2.0.AA
      2f39691f
    • L
      Merge tag 'sound-fix-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ffb29b42
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Here is the additional fix patches that have been queued up since the
        previous pull request.  A few HD-audio fixes, a USB-audio quirk
        addition, and a couple of trivial cleanup for the legacy OSS codes"
      
      * tag 'sound-fix-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Set TLV_DB_SCALE_MUTE bit for cx5051 vmaster
        ALSA: hda/ca0132 - Don't try loading firmware at resume when already failed
        ALSA: hda - Fix pop noises on reboot for Dell XPS 13 9333
        ALSA: hda - Set internal mic as default input source on Dell XPS 13 9333
        ALSA: usb-audio: fix BOSS ME-25 MIDI regression
        ALSA: hda - Fix parsing of CMI8888 codec
        ALSA: hda - Fix probing and stuttering on CMI8888 HD-audio controller
        ALSA: hda/realtek - Fixed ALC286/ALC288 recording delay for Headset Mic
        sound: oss: Remove typedefs wanc_info and wavnc_port_info
        sound: oss: uart401: Remove typedef uart401_devc
      ffb29b42
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · d22af68b
      Linus Torvalds 提交于
      Pull drm fixes (mostly nouveau) from Dave Airlie:
       "One doc buidling fixes for a file that moved, along with a bunch of
        nouveau fixes, one a build problem on ARM"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/doc: Refer to proper source file
        drm/nouveau/platform: fix compilation error
        drm/nouveau/gk20a: add LTC device
        drm/nouveau: warn if we fail to re-pin fb on resume
        drm/nouveau/nvif: fix dac load detect method definition
        drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries
        drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0
        drm/nouveau/ltc: fix tag base address getting truncated if above 4GiB
        drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform
        drm/nouveau/bar: behave better if ioremap failed
        drm/nouveau/kms: nouveau_fbcon_accel_fini can be static
        drm/nouveau: kill unused variable warning if !__OS_HAS_AGP
        drm/nouveau/nvif: fix a number of notify thinkos
      d22af68b
    • L
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · 68ffeca4
      Linus Torvalds 提交于
      Pull EDAC updates from Mauro Carvalho Chehab.
      
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        sb_edac: add support for Haswell based systems
        sb_edac: Fix mix tab/spaces alignments
        edac: add DDR4 and RDDR4
        sb_edac: remove bogus assumption on mc ordering
        sb_edac: make minimal use of channel_mask
        sb_edac: fix socket detection on Ivy Bridge controllers
        sb_edac: update Kconfig description
        sb_edac: search devices using product id
        sb_edac: make RIR limit retrieval per model
        sb_edac: make node id retrieval per model
        sb_edac: make memory type detection per memory controller
      68ffeca4
  9. 15 8月, 2014 23 次提交