From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Jan 2021 20:28:07 +0000 (-0800)
Subject: Merge tag 'staging-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~8102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ad9a28f56d70b950b1232151b2354636853727a;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'staging-5.11-rc3' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are some small staging driver fixes for 5.11-rc3. Nothing major,
  just resolving some reported issues:

   - cleanup some remaining mentions of the ION drivers that were
     removed in 5.11-rc1

   - comedi driver bugfix

   - two error path memory leak fixes

  All have been in linux-next for a while with no reported issues"

* tag 'staging-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: ION: remove some references to CONFIG_ION
  staging: mt7621-dma: Fix a resource leak in an error handling path
  Staging: comedi: Return -EFAULT if copy_to_user() fails
  staging: spmi: hisi-spmi-controller: Fix some error handling paths
---

4ad9a28f56d70b950b1232151b2354636853727a