Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
From:   Dave Airlie <airlied@gmail.com>
Date:   Fri, 12 Aug 2022 06:09:44 +1000
Message-ID: <CAPM=9twZGrzg6pXcHQkaPfCScrE-DMh5PC1UnRULbtv1eC6vdA@mail.gmail.com>
Subject: [git pull] drm fixes for 6.0-rc1
To:     Linus Torvalds <torvalds@linux-foundation.org>,
        Daniel Vetter <daniel.vetter@ffwll.ch>
Cc:     dri-devel <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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(-)