1. 09 12月, 2014 1 次提交
  2. 08 12月, 2014 5 次提交
    • D
      Merge branch 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip into drm-next · b75478d1
      Dave Airlie 提交于
      Merge rockchip GPU support.
      
      This has a branch in common with the iommu tree, hopefully the
      process works.
      
      * 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip:
        dt-bindings: video: Add documentation for rockchip vop
        dt-bindings: video: Add for rockchip display subsytem
        drm: rockchip: Add basic drm driver
        dt-bindings: iommu: Add documentation for rockchip iommu
        iommu/rockchip: rk3288 iommu driver
      b75478d1
    • D
      Merge branch 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux into drm-next · b00ff043
      Dave Airlie 提交于
      As discussed on irc, I'm sending a pull request with one important change:
      
      - Disable support for 32-bit user processes. This is done due to AMD's decision
        to remove support for 32-bit user processes on Linux for its HSA stack.
      
      * 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux:
        amdkfd: Disable support for 32-bit user processes
      b00ff043
    • D
      Merge tag 'v3.18' into drm-next · 8c863944
      Dave Airlie 提交于
      Linux 3.18
      
      Backmerge Linus tree into -next as we had conflicts in i915/radeon/nouveau,
      and everyone was solving them individually.
      
      * tag 'v3.18': (57 commits)
        Linux 3.18
        watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
        uapi: fix to export linux/vm_sockets.h
        i2c: cadence: Set the hardware time-out register to maximum value
        i2c: davinci: generate STP always when NACK is received
        ahci: disable MSI on SAMSUNG 0xa800 SSD
        context_tracking: Restore previous state in schedule_user
        slab: fix nodeid bounds check for non-contiguous node IDs
        lib/genalloc.c: export devm_gen_pool_create() for modules
        mm: fix anon_vma_clone() error treatment
        mm: fix swapoff hang after page migration and fork
        fat: fix oops on corrupted vfat fs
        ipc/sem.c: fully initialize sem_array before making it visible
        drivers/input/evdev.c: don't kfree() a vmalloc address
        cxgb4: Fill in supported link mode for SFP modules
        xen-netfront: Remove BUGs on paged skb data which crosses a page boundary
        mm/vmpressure.c: fix race in vmpressure_work_fn()
        mm: frontswap: invalidate expired data on a dup-store failure
        mm: do not overwrite reserved pages counter at show_mem()
        drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6
        ...
      
      Conflicts:
      	drivers/gpu/drm/i915/intel_display.c
      	drivers/gpu/drm/nouveau/nouveau_drm.c
      	drivers/gpu/drm/radeon/radeon_cs.c
      8c863944
    • L
      Linux 3.18 · b2776bf7
      Linus Torvalds 提交于
      b2776bf7
    • L
      Merge branch 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 820b688b
      Linus Torvalds 提交于
      Pull libata fixes from Tejun Heo:
       "Three libata fixes for v3.18.  Nothing too interesting.  PCI ID ID and
        quirk additions to ahci and an error handling path fix in sata_fsl"
      
      * 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci: disable MSI on SAMSUNG 0xa800 SSD
        sata_fsl: fix error handling of irq_of_parse_and_map
        AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller
      820b688b
  3. 07 12月, 2014 2 次提交
  4. 06 12月, 2014 4 次提交
  5. 05 12月, 2014 11 次提交
  6. 04 12月, 2014 17 次提交