[git,pull] drm fixes for 6.0-rc1

Pull-request

git://anongit.freedesktop.org/drm/drm tags/drm-next-2022-08-12-1

Message

Dave Airlie Aug. 11, 2022, 8:09 p.m. UTC

Hey Linus,

not much to squeeze into rc1, just two small fixes, one for core gem
and one for shmem-helpers.

Dave.

drm-next-2022-08-12-1:
drm fixes for 6.0-rc1

gem:
- Annotate WW context in error paths

shmem-helper:
- Add missing vunmap in error paths
The following changes since commit 5493ee1919eae4f49d62276cf5986b7f7c7aa8f6:

  Merge tag 'amd-drm-next-5.20-2022-07-29' of
https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-08-03
14:00:19 +1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-next-2022-08-12-1

for you to fetch changes up to 36fa1cb56ac5189c78dacbbb14d452d0c44b86c0:

  Merge tag 'drm-misc-next-fixes-2022-08-10' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next (2022-08-12
05:57:12 +1000)

----------------------------------------------------------------
drm fixes for 6.0-rc1

gem:
- Annotate WW context in error paths

shmem-helper:
- Add missing vunmap in error paths

----------------------------------------------------------------
Dave Airlie (1):
      Merge tag 'drm-misc-next-fixes-2022-08-10' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next

Dmitry Osipenko (2):
      drm/shmem-helper: Add missing vunmap on error
      drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error

 drivers/gpu/drm/drm_gem.c              | 4 ++--
 drivers/gpu/drm/drm_gem_shmem_helper.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

[e-mail] Aug. 12, 2022, 4:02 p.m. UTC | #1

The pull request you sent on Fri, 12 Aug 2022 06:09:44 +1000:

> git://anongit.freedesktop.org/drm/drm tags/drm-next-2022-08-12-1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7ce2aa6d7fe121e243e1c8a8093911fecdf1c88e

Thank you!