Commit b05ee6bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Staging tree patches for 3.3-rc3

Big things here is the deletion of the Android pmem driver, as it's
obsolete and no one uses it, the gma500 driver as it's already in the
drm portion of the kernel tree, and the pohmelfs filesystem as it's
obsolete and a rewritten version is being proposed for the fs/ section
of the kernel.

Other than that, a smattering of different bugfixes and regressions, and
some omap drm api merge fixups that were needed due to api changes in
the main portion of the drm tree, allowing this code to build properly
again.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits)
  staging: pohmelfs: remove drivers/staging/pohmelfs
  staging: android/ram_console: Don't build on arches w/o ioremap
  staging: r8712u: Use asynchronous firmware loading
  staging: usbip: fix to prevent potentially using uninitialized spinlock
  staging: r8712u: Fix problem when CONFIG_R8712_AP is set
  staging: tidspbridge: fix incorrect free to drv_datap
  staging: tidspbridge: fix bridge_open memory leaks
  staging: android: lowmemorykiller: Don't wait more than one second for a process to die
  MAINTAINERS: staging: iio: add iio information
  staging: zcache: fix serialization bug in zv stats
  staging: fix go7007-usb license
  Staging: android: binder: Fix crashes when sharing a binder file between processes
  Staging: android: Remove pmem driver
  Staging: asus_oled: fix NULL-ptr crash on unloading
  Staging: asus_oled: fix image processing
  Staging: android: binder: Don't call dump_stack in binder_vma_open
  staging: r8712u: Add new Sitecom UsB ID
  zcache: Set SWIZ_BITS to 8 to reduce tmem bucket lock contention.
  zcache: fix deadlock condition
  staging: drm/omap: fix locking issue
  ...
parents b0286db4 67435319

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3318,6 +3318,12 @@ S: Maintained 
F:	net/ieee802154/

F:	drivers/ieee802154/



IIO SUBSYSTEM AND DRIVERS

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	drivers/staging/iio/



IKANOS/ADI EAGLE ADSL USB DRIVER

M:	Matthieu Castet <castet.matthieu@free.fr>

M:	Stanislaw Gruszka <stf_xl@wp.pl>

drivers/staging/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ source "drivers/staging/rts5139/Kconfig" 


source "drivers/staging/frontier/Kconfig"



source "drivers/staging/pohmelfs/Kconfig"



source "drivers/staging/phison/Kconfig"



source "drivers/staging/line6/Kconfig"
@@ -120,8 +118,6 @@ source "drivers/staging/cptm1217/Kconfig" 


source "drivers/staging/ste_rmi4/Kconfig"



source "drivers/staging/gma500/Kconfig"



source "drivers/staging/mei/Kconfig"



source "drivers/staging/nvec/Kconfig"

drivers/staging/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ obj-$(CONFIG_R8712U) += rtl8712/ 
obj-$(CONFIG_RTS_PSTOR)		+= rts_pstor/

obj-$(CONFIG_RTS5139)		+= rts5139/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_IDE_PHISON)	+= phison/

obj-$(CONFIG_LINE6_USB)		+= line6/

obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/
@@ -52,7 +51,6 @@ obj-$(CONFIG_FT1000) += ft1000/ 
obj-$(CONFIG_SPEAKUP)		+= speakup/

obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/

obj-$(CONFIG_DRM_PSB)		+= gma500/

obj-$(CONFIG_INTEL_MEI)		+= mei/

obj-$(CONFIG_MFD_NVEC)		+= nvec/

obj-$(CONFIG_DRM_OMAP)		+= omapdrm/

drivers/staging/android/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config ANDROID_LOGGER 


config ANDROID_RAM_CONSOLE

	bool "Android RAM buffer console"

	depends on !S390 && !UML

	default n



config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE
@@ -99,10 +100,6 @@ config ANDROID_LOW_MEMORY_KILLER 
	---help---

	  Register processes to be killed when memory is low



config ANDROID_PMEM

	bool "Android pmem allocator"

	depends on ARM



source "drivers/staging/android/switch/Kconfig"



endif # if ANDROID

drivers/staging/android/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,5 +5,4 @@ obj-$(CONFIG_ANDROID_RAM_CONSOLE) += ram_console.o 
obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o

obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o

obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o

obj-$(CONFIG_ANDROID_PMEM)		+= pmem.o

obj-$(CONFIG_ANDROID_SWITCH)		+= switch/

CRA Git | Maintained and supported by SUSTech CRA and CCSE