1. 08 4月, 2016 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 1c915b3a
      Linus Torvalds 提交于
      Pull Ceph fix from Sage Weil:
       "This just fixes a few remaining memory allocations in RBD to use
        GFP_NOIO instead of GFP_ATOMIC"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: use GFP_NOIO consistently for request allocations
      1c915b3a
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · d3436a1d
      Linus Torvalds 提交于
      Pull virtio/qemu fixes from Michael S Tsirkin:
       "A couple of fixes for virtio and for the new QEMU fw cfg driver"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit
        MAINTAINERS: add entry for QEMU
        firmware: qemu_fw_cfg.c: hold ACPI global lock during device access
        virtio: virtio 1.0 cs04 spec compliance for reset
        qemu_fw_cfg: don't leak kobj on init error
      d3436a1d
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 741f37b8
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "This is mostly amdgpu/radeon fixes, and imx related fixes.
      
        There is also one one TTM fix, one nouveau fix, and one hdlcd fix.
      
        The AMD ones are some fixes for power management after suspend/resume
        one some GPUs, and some vblank fixes.
      
        The IMX ones are for more stricter plane checks and some cleanups.
      
        I'm off until Monday, so therre might be some fixes early next week if
        anyone missed me"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (34 commits)
        drm/nouveau/tegra: acquire and enable reference clock if needed
        drm/amdgpu: total vram size also reduces pin size
        drm/amd/powerplay: add uvd/vce dpm enabling flag default.
        drm/amd/powerplay: fix issue that resume back, dpm can't work on FIJI.
        drm/amdgpu: save and restore the firwmware cache part when suspend resume
        drm/amdgpu: save and restore UVD context with suspend and resume
        drm/ttm: use phys_addr_t for ttm_bus_placement
        drm: ARM HDLCD - fix an error code
        drm: ARM HDLCD - get rid of devm_clk_put()
        drm/radeon: Only call drm_vblank_on/off between drm_vblank_init/cleanup
        drm/amdgpu: fence wait old rcu slot
        drm/amdgpu: fix leaking fence in the pageflip code
        drm/amdgpu: print vram type rather than just DDR
        drm/amdgpu/gmc: use proper register for vram type on Fiji
        drm/amdgpu/gmc: move vram type fetching into sw_init
        drm/amdgpu: Set vblank_disable_allowed = true
        drm/radeon: Set vblank_disable_allowed = true
        drm/amd/powerplay: Need to change boot to performance state in resume.
        drm/amd/powerplay: add new Fiji function for not setting same ps.
        drm/amdgpu: check dpm state before pm system fs initialized.
        ...
      741f37b8
  2. 07 4月, 2016 8 次提交
    • S
      virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit · c00bbcf8
      Stefan Hajnoczi 提交于
      The VIRTIO 1.0 specification added the DEVICE_NEEDS_RESET device status
      bit in "VIRTIO-98: Add DEVICE_NEEDS_RESET".  This patch defines the
      device status bit in the uapi header file so that both the kernel and
      userspace applications can use it.
      
      The bit is currently unused by the virtio guest drivers and vhost.
      According to the spec "a good implementation will try to recover by
      issuing a reset".  This is not attempted here because it requires
      auditing the virtio drivers to ensure there are no resource leaks or
      crashes if the device needs to be reset mid-operation.
      
      See "2.1 Device Status Field" in the VIRTIO 1.0 specification for
      details.
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      c00bbcf8
    • M
      MAINTAINERS: add entry for QEMU · eeca9a67
      Michael S. Tsirkin 提交于
      Gabriel merged support for QEMU FW CFG interface, but there's apparently
      no official maintainer. It's also possible that this will grow more
      interfaces in future.  I'll happily co-maintain it and handle pull
      requests together with the rest of the PV stuff I maintain.
      
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Gabriel Somlo <somlo@cmu.edu>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Acked-by: NGabriel Somlo <somlo@cmu.edu>
      eeca9a67
    • G
      firmware: qemu_fw_cfg.c: hold ACPI global lock during device access · def7ac80
      Gabriel Somlo 提交于
      Allowing for the future possibility of implementing AML-based
      (i.e., firmware-triggered) access to the QEMU fw_cfg device,
      acquire the global ACPI lock when accessing the device on behalf
      of the guest-side sysfs driver, to prevent any potential race
      conditions.
      Suggested-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NGabriel Somlo <somlo@cmu.edu>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      def7ac80
    • M
      virtio: virtio 1.0 cs04 spec compliance for reset · 05dbcb43
      Michael S. Tsirkin 提交于
      The spec says: after writing 0 to device_status, the driver MUST wait
      for a read of device_status to return 0 before reinitializing the
      device.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Acked-by: NJason Wang <jasowang@redhat.com>
      05dbcb43
    • M
      qemu_fw_cfg: don't leak kobj on init error · e8aabc64
      Michael S. Tsirkin 提交于
      If platform_driver_register fails, we should
      cleanup fw_cfg_top_ko before exiting.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Acked-by: NGabriel Somlo <somlo@cmu.edu>
      e8aabc64
    • D
      Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · fd8c61eb
      Dave Airlie 提交于
      Lots of misc bug fixes for radeon and amdgpu and one for ttm.
      - fix vram info fetching on Fiji and unposted boards
      - additional vblank fixes from the conversion to drm_vblank_on/off
      - UVD dGPU suspend and resume fixes
      - lots of powerplay fixes
      - fix a fence leak in the pageflip code
      - ttm fix for platforms where CPU is 32 bit, but physical addresses are >32bits
      
      * 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux: (21 commits)
        drm/amdgpu: total vram size also reduces pin size
        drm/amd/powerplay: add uvd/vce dpm enabling flag default.
        drm/amd/powerplay: fix issue that resume back, dpm can't work on FIJI.
        drm/amdgpu: save and restore the firwmware cache part when suspend resume
        drm/amdgpu: save and restore UVD context with suspend and resume
        drm/ttm: use phys_addr_t for ttm_bus_placement
        drm/radeon: Only call drm_vblank_on/off between drm_vblank_init/cleanup
        drm/amdgpu: fence wait old rcu slot
        drm/amdgpu: fix leaking fence in the pageflip code
        drm/amdgpu: print vram type rather than just DDR
        drm/amdgpu/gmc: use proper register for vram type on Fiji
        drm/amdgpu/gmc: move vram type fetching into sw_init
        drm/amdgpu: Set vblank_disable_allowed = true
        drm/radeon: Set vblank_disable_allowed = true
        drm/amd/powerplay: Need to change boot to performance state in resume.
        drm/amd/powerplay: add new Fiji function for not setting same ps.
        drm/amdgpu: check dpm state before pm system fs initialized.
        drm/amd/powerplay: notify amdgpu whether dpm is enabled or not.
        drm/amdgpu: Not support disable dpm in powerplay.
        drm/amdgpu: add an cgs interface to notify amdgpu the dpm state.
        ...
      fd8c61eb
    • L
      x86: remove the kernel code/data/bss resources from /proc/iomem · c4004b02
      Linus Torvalds 提交于
      Let's see if anybody even notices.  I doubt anybody uses this, and it
      does expose addresses that should be randomized, so let's just remove
      the code.  It's old and traditional, and it used to be cute, but we
      should have removed this long ago.
      
      If it turns out anybody notices and this breaks something, we'll have to
      revert this, and maybe we'll end up using other approaches instead
      (using %pK or similar).  But removing unnecessary code is always the
      preferred option.
      Noted-by: NEmrah Demir <ed@abdsec.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c4004b02
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 9cb5b787
      Linus Torvalds 提交于
      Pull rdma fixes from Doug Ledford:
       "I'm back from PTO.  These issues cropped up while I was gone and are
        simple fixes.  I'll have more after I've caught up, but I wanted to
        get these in quick.
      
        Two minor fixes for 4.6-rc2:
      
         - Fix mlx5 build error when on demand paging is not enabled
      
         - Fix possible uninit variable in new i40iw driver"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        i40iw: avoid potential uninitialized variable use
        IB/mlx5: fix VFs callback function prototypes
      9cb5b787
  3. 06 4月, 2016 10 次提交
  4. 05 4月, 2016 19 次提交