diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-30 18:38:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-30 18:38:11 +0100 |
| commit | d5bb349dbbe27537e90a03b9597deeb07723a86d (patch) | |
| tree | b5ad5b6996bf1fb51c84fb252f2ddf9316ee7d81 /net/mac80211/ibss.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| parent | Merge branch 'vmwgfx-coherent' of git://people.freedesktop.org/~thomash/linux... (diff) | |
| download | linux-d5bb349dbbe27537e90a03b9597deeb07723a86d.tar.xz linux-d5bb349dbbe27537e90a03b9597deeb07723a86d.zip | |
Merge tag 'drm-vmwgfx-coherent-2019-11-29' of git://anongit.freedesktop.org/drm/drm
Pull drm coherent memory support for vmwgfx from Dave Airlie:
"This is a separate pull for the mm pagewalking + drm/vmwgfx work
Thomas did and you were involved in, I've left it separate in case you
don't feel as comfortable with it as the other stuff.
It has mm acks/r-b in the right places from what I can see"
* tag 'drm-vmwgfx-coherent-2019-11-29' of git://anongit.freedesktop.org/drm/drm:
drm/vmwgfx: Add surface dirty-tracking callbacks
drm/vmwgfx: Implement an infrastructure for read-coherent resources
drm/vmwgfx: Use an RBtree instead of linked list for MOB resources
drm/vmwgfx: Implement an infrastructure for write-coherent resources
mm: Add write-protect and clean utilities for address space ranges
mm: Add a walk_page_mapping() function to the pagewalk code
mm: pagewalk: Take the pagetable lock in walk_pte_range()
mm: Remove BUG_ON mmap_sem not held from xxx_trans_huge_lock()
drm/ttm: Convert vm callbacks to helpers
drm/ttm: Remove explicit typecasts of vm_private_data
Diffstat (limited to 'net/mac80211/ibss.c')
0 files changed, 0 insertions, 0 deletions