From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Jun 2024 16:11:59 +0000 (-0700)
Subject: Merge tag 'staging-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v6.10-rc6~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=12529aa130276d622fe229f0c208ad3fb7e7138e;p=linux-block.git

Merge tag 'staging-6.10-rc6' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are two small staging driver fixes for 6.10-rc6, both for the
  vc04_services drivers:

   - build fix if CONFIG_DEBUGFS was not set

   - initialization check fix that was much reported.

  Both of these have been in linux-next this week with no reported
  issues"

* tag 'staging-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vchiq_debugfs: Fix build if CONFIG_DEBUG_FS is not set
  staging: vc04_services: vchiq_arm: Fix initialisation check
---

12529aa130276d622fe229f0c208ad3fb7e7138e