1. 27 4月, 2018 10 次提交
  2. 26 4月, 2018 13 次提交
    • R
      Merge branches 'acpi-watchdog', 'acpi-button' and 'acpi-video' · bd6dff55
      Rafael J. Wysocki 提交于
      * acpi-watchdog:
        ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
      
      * acpi-button:
        ACPI / button: make module loadable when booted in non-ACPI mode
      
      * acpi-video:
        ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
      bd6dff55
    • R
      Merge branches 'acpi-pm' and 'pm-cpufreq' · e140c4af
      Rafael J. Wysocki 提交于
      * acpi-pm:
        ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)
      
      * pm-cpufreq:
        cpufreq: brcmstb-avs-cpufreq: remove development debug support
      e140c4af
    • L
      Merge tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 69bfd470
      Linus Torvalds 提交于
      Pull fsnotify fix from Jan Kara:
       "A fix of a fsnotify race causing panics / softlockups"
      
      * tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: Fix fsnotify_mark_connector race
      69bfd470
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 3442097b
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Eight bug fixes, one spelling update and one tracepoint addition.
      
        The most serious is probably the mptsas write same fix because it
        means anyone using these controllers sees errors when modern
        filesystems try to issue discards"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: target: fix crash with iscsi target and dvd
        scsi: sd_zbc: Avoid that resetting a zone fails sporadically
        scsi: sd: Defer spinning up drive while SANITIZE is in progress
        scsi: megaraid_sas: Do not log an error if FW successfully initializes.
        scsi: ufs: add trace event for ufs upiu
        scsi: core: remove reference to scsi_show_extd_sense()
        scsi: mptsas: Disable WRITE SAME
        scsi: fnic: fix spelling mistake in fnic stats "Abord" -> "Abort"
        scsi: scsi_debug: IMMED related delay adjustments
        scsi: iscsi: respond to netlink with unicast when appropriate
      3442097b
    • L
      Merge tag 'for-linus-20180425' of git://git.kernel.dk/linux-block · 8fba70b0
      Linus Torvalds 提交于
      Pull block updates from Jens Axboe:
       "I ended up sitting on this about a week longer than I wanted to, since
        we were hashing out details with a timeout change. I've now killed
        that patch, so we can flush the existing queue in due time.
      
        This contains:
      
         - Fix for an old regression, where entering the queue can be
           disturbed by a signal to the process. This can cause spurious EIO.
           Fix from Alan Jenkins.
      
         - cdrom information leak fix from Dan.
      
         - Trivial helper for testing queue FUA from Dave Chinner, part of his
           O_DIRECT FUA series.
      
         - Series of swim fixes from Finn that actually makes it work again.
      
         - Loop O_DIRECT corruption fix, which caused data corruption in
           production for us. From me.
      
         - BFQ crash fix from me.
      
         - bcache maintainer update. Michael no longer has the time to do it,
           Coly has stepped up to serve as the new maintainer.
      
         - blkcg locking fixes from Jiang Biao.
      
         - Revert of a change from this merge window from Ming, that causes an
           issue on some hardware.
      
         - Minor clarification doc addition from Linus Walleij"
      
      * tag 'for-linus-20180425' of git://git.kernel.dk/linux-block: (22 commits)
        Revert "blk-mq: remove code for dealing with remapping queue"
        block: mq: Add some minor doc for core structs
        bcache: mark Coly Li as bcache maintainer
        MAINTAINERS: Remove me as maintainer of bcache
        blkcg: init root blkcg_gq under lock
        blkcg: small fix on comment in blkcg_init_queue
        blkcg: don't hold blkcg lock when deactivating policy
        block: add blk_queue_fua() helper function
        cdrom: information leak in cdrom_ioctl_media_changed()
        bfq-iosched: ensure to clear bic/bfqq pointers when preparing request
        blk-mq: start request gstate with gen 1
        block/swim: Select appropriate drive on device open
        block/swim: Fix IO error at end of medium
        block/swim: Check drive type
        block/swim: Rename macros to avoid inconsistent inverted logic
        block/swim: Don't log an error message for an invalid ioctl
        block/swim: Remove extra put_disk() call from error path
        block/swim: Fix array bounds check
        m68k/mac: Don't remap SWIM MMIO region
        loop: handle short DIO reads
        ...
      8fba70b0
    • L
      Merge tag 'riscv-for-linus-4.17-rc3' of... · c6dc3e71
      Linus Torvalds 提交于
      Merge tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
      
      Pull RISC-V fixes from Palmer Dabbelt:
       "This contains three small fixes related to the RISC-V port that I'd
        like to target for 4.17-rc3:
      
         - a Kconfig cleanup to select DMA_DIRECT_OPS instead of redefining it
           in arch/riscv
      
         - the removal of asm/handle_irq.h, which doesn't exist, from our arch
           header list
      
         - the addition of "-no-pie" the link rules for our VDSO-related
           files, which fixes the build on systems where PIE is enabled by
           default"
      
      * tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
        RISC-V: build vdso-dummy.o with -no-pie
        riscv: there is no <asm/handle_irq.h>
        riscv: select DMA_DIRECT_OPS instead of redefining it
      c6dc3e71
    • L
      Merge tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping · 26ed24e4
      Linus Torvalds 提交于
      Pull dma-mapping fixes from Christoph Hellwig:
       "A few small dma-mapping fixes for Linux 4.17-rc3:
      
         - don't loop to try GFP_DMA allocations if ZONE_DMA is not actually
           enabled (regression in 4.16)
      
         - don't try to do virt_to_page before we know we actuall have a valid
           page in dma_common_mmap
      
         - a comment fixup related to the above fix"
      
      * tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping:
        dma-mapping: postpone cpu addr translation on mmap
        dma-coherent: clarify dma_mmap_from_dev_coherent documentation
        dma-direct: don't retry allocation for no-op GFP_DMA
      26ed24e4
    • M
      virtio_console: reset on out of memory · 5c60300d
      Michael S. Tsirkin 提交于
      When out of memory and we can't add ctrl vq buffers,
      probe fails. Unfortunately the error handling is
      out of spec: it calls del_vqs without bothering
      to reset the device first.
      
      To fix, call the full cleanup function in this case.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      5c60300d
    • M
      virtio_console: move removal code · aa44ec86
      Michael S. Tsirkin 提交于
      Will make it reusable for error handling.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      aa44ec86
    • M
      virtio_console: drop custom control queue cleanup · 61a8950c
      Michael S. Tsirkin 提交于
      We now cleanup all VQs on device removal - no need
      to handle the control VQ specially.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      61a8950c
    • M
      virtio_console: free buffers after reset · a7a69ec0
      Michael S. Tsirkin 提交于
      Console driver is out of spec. The spec says:
      	A driver MUST NOT decrement the available idx on a live
      	virtqueue (ie. there is no way to “unexpose” buffers).
      and it does exactly that by trying to detach unused buffers
      without doing a device reset first.
      
      Defer detaching the buffers until device unplug.
      
      Of course this means we might get an interrupt for
      a vq without an attached port now. Handle that by
      discarding the consumed buffer.
      Reported-by: NTiwei Bie <tiwei.bie@intel.com>
      Fixes: b3258ff1 ("virtio: Decrement avail idx on buffer detach")
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      a7a69ec0
    • M
      virtio: add ability to iterate over vqs · 24a7e4d2
      Michael S. Tsirkin 提交于
      For cleanup it's helpful to be able to simply scan all vqs and discard
      all data. Add an iterator to do that.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      24a7e4d2
    • M
      virtio_console: don't tie bufs to a vq · 2855b335
      Michael S. Tsirkin 提交于
      an allocated buffer doesn't need to be tied to a vq -
      only vq->vdev is ever used. Pass the function the
      just what it needs - the vdev.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      2855b335
  3. 25 4月, 2018 17 次提交