Commit 37bb2e72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver updates from Greg KH:
 "Here is the big set of staging driver updates for 6.19-rc1.

  Only thing "major" in here is that two subsystems, gpib and vc04 have
  moved out of the staging tree into the "real" portion of the kernel,
  which is great to see. Other than that, the rest of the changes are
  just tiny coding style cleanups, nothing earth-shattering.

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

* tag 'staging-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (53 commits)
  staging: rtl8723bs: fix out-of-bounds read in OnBeacon ESR IE parsing
  staging: rtl8723bs: fix stack buffer overflow in OnAssocReq IE parsing
  staging: rtl8723bs: fix out-of-bounds read in rtw_get_ie() parser
  staging: gpib: Clean-up commented-out code
  staging: rtl8723bs: remove custom FIELD_OFFSET macro
  staging: rtl8723bs: replace FIELD_OFFSET usage with offsetof in rtw_mlme_ext.c
  staging: rtl8723bs: remove dead commented code from odm.c
  staging: rtl8723bs: use standard offsetof in cfg80211 operations
  staging: rtl8723bs: remove unused registry and BSSID offset macros
  staging: rtl8723bs: core: delete commented-out code
  staging: rtl8723bs: core: fix block comment style issues
  staging: greybus: uart: check return values during probe
  staging: fbtft: core: fix potential memory leak in fbtft_probe_common()
  staging: gpib: Destage gpib
  staging: gpib: Fix SPDX license for gpib headers
  staging: gpib: Update TODO file
  staging: gpib: Change // comments in uapi header file
  platform/raspberrypi: Destage VCHIQ MMAL driver
  platform/raspberrypi: Destage VCHIQ interface
  staging: vc04_services: Cleanup VCHIQ TODO entries
  ...
parents f5e9d31e 502ddcc4

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -4910,7 +4910,9 @@ S: Maintained 
T:	git https://github.com/broadcom/stblinux.git

F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

F:	drivers/pci/controller/pcie-brcmstb.c

F:	drivers/platform/raspberrypi/vchiq-*

F:	drivers/staging/vc04_services

F:	include/linux/raspberrypi/vchiq*

N:	bcm2711

N:	bcm2712

N:	bcm283*
@@ -10727,7 +10729,9 @@ F: drivers/platform/x86/gpd-pocket-fan.c 
GPIB DRIVERS

M:	Dave Penkler <dpenkler@gmail.com>

S:	Maintained

F:	drivers/staging/gpib/

F:	drivers/gpib/

F:	include/uapi/linux/gpib.h

F:	include/uapi/linux/gpib_ioctl.h









GPIO ACPI SUPPORT









M:	Mika Westerberg <westeri@kernel.org>
































drivers/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig"

















source "drivers/comedi/Kconfig"



















source "drivers/gpib/Kconfig"



















source "drivers/staging/Kconfig"



















source "drivers/platform/Kconfig"
































drivers/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -150,6 +150,7 @@ obj-$(CONFIG_VHOST_IOTLB)	+= vhost/







obj-$(CONFIG_VHOST)		+= vhost/









obj-$(CONFIG_GREYBUS)		+= greybus/









obj-$(CONFIG_COMEDI)		+= comedi/









obj-$(CONFIG_GPIB)		+= gpib/









obj-$(CONFIG_STAGING)		+= staging/









obj-y				+= platform/










































drivers/staging/gpib/Kconfig→drivers/gpib/Kconfig



+4
−4






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









menuconfig GPIB









	tristate "Linux GPIB drivers"









	tristate "GPIB drivers"









	help









	  Enable support for GPIB cards and dongles for Linux.  GPIB









	  is the General Purpose Interface Bus which conforms to the









	  IEEE488 standard.









	  Enable support for GPIB cards and dongles.  GPIB is the









	  General Purpose Interface Bus which conforms to the IEEE488









	  standard.



















	  This set of drivers can be used with the corresponding user









	  space library that can be found on Sourceforge under linux-gpib.
































drivers/staging/gpib/Makefile→drivers/gpib/Makefile



+1
−1






























Original line number
Diff line number
Diff line



















subdir-ccflags-y += -I$(src)/include -I$(src)/uapi









subdir-ccflags-y += -I$(src)/include



















obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b/









obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a/