From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Dec 2018 18:35:33 +0000 (-0800)
Subject: Merge tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v5.15~7456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47dcb0802d28813e4600192ce27475681f96f230;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull staging fixes from Greg KH:
 "Here are two staging driver bugfixes for 4.20-rc6.

  One is a revert of a previously incorrect patch that was merged a
  while ago, and the other resolves a possible buffer overrun that was
  found by code inspection.

  Both of these have been in the linux-next tree with no reported
  issues"

* tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Revert commit ef9209b642f "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c"
  staging: rtl8712: Fix possible buffer overrun
---

47dcb0802d28813e4600192ce27475681f96f230