From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Dec 2022 11:27:03 +0000 (-0800)
Subject: Merge tag 'staging-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v6.6.17~5902
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b83a7080d30032cf70832bc2bb04cc342e203b88;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'staging-6.2-rc1' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here is the large set of staging driver changes for 6.2-rc1.

  Another round of cleanups for staging drivers with no big additions.
  Overall more lines were removed than added, always a nice sign, with
  nothing happening in here other than general coding style cleanups and
  minor fixes in the drivers. Full, boring, details are in the shortlog.

  All of these have been in linux-next for a while with no reported
  problems"

* tag 'staging-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (253 commits)
  vme: Use root_device_register() not underlined version
  staging: rtl8192e: Fix spelling mistake "ContryIE" -> "CountryIE"
  vme: Fix error not catched in fake_init()
  staging: vme_user: remove multiple blank lines
  staging: r8188eu: use subtype helper in rtw_check_bcn_info
  staging: r8188eu: use subtype helpers in collect_bss_info
  staging: r8188eu: remove unused da parameter
  staging: r8188eu: merge two probereq_p2p functions
  staging: r8188eu: simplify err handling for unknown station
  staging: r8188eu: handle the non-ap case first
  staging: r8188eu: move bBusyTraffic update
  staging: r8188eu: read reason code from ieee80211_mgmt
  staging: r8188eu: use ieee80211_mgmt to parse addresses
  staging: r8188eu: remove a variable
  staging: r8188eu: simplify error handling for missing station
  staging: r8188eu: stop beacon processing if kmalloc fails
  staging: r8188eu: exit if beacon is not from our bss
  staging: r8188eu: simplify update_sta_support_rate params
  staging: r8188eu: use ie buffer in update_beacon_info
  staging: r8188eu: pass only ies to process_p2p_ps_ie
  ...
---

b83a7080d30032cf70832bc2bb04cc342e203b88
diff --cc drivers/staging/sm750fb/Kconfig
index acb6c08,2101a66..1461c89
--- a/drivers/staging/sm750fb/Kconfig
+++ b/drivers/staging/sm750fb/Kconfig
@@@ -6,10 -6,9 +6,10 @@@ config FB_SM75
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
  	select FB_CFB_IMAGEBLIT
 +	select VIDEO_NOMODESET
  	help
  	  Frame buffer driver for the Silicon Motion SM750 chip
- 	  with 2D accelearion and dual head support.
+ 	  with 2D acceleration and dual head support.
  
  	  This driver is also available as a module. The module will be
  	  called sm750fb. If you want to compile it as a module, say M