From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Mar 2026 20:10:49 +0000 (-0700)
Subject: Merge tag 'media/v7.0-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v7.0-rc6~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f44c65111e9da0fa378ddf832c90e93855628dc9;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'media/v7.0-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

 - uvcvideo may cause OOPS when out of memory

 - remove a deadlock in the ccs driver

* tag 'media/v7.0-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: ccs: Avoid deadlock in ccs_init_state()
  media: uvcvideo: Fix bug in error path of uvc_alloc_urb_buffers
---

f44c65111e9da0fa378ddf832c90e93855628dc9