1
0
Fork 0
alistair23-linux/drivers/staging/wilc1000
Linus Torvalds 72cca7baf4 Staging/IIO patches for 4.10-rc1
Here's the "big" staging/iio pull request for 4.10-rc1.
 
 Not as big as 4.9 was, but still just over a thousand changes.  We
 almost broke even of lines added vs. removed, as the slicoss driver was
 removed (got a "clean" driver for the same hardware through the netdev
 tree), and some iio drivers were also dropped, but I think we ended up
 adding a few thousand lines to the source tree in the end.  Other than
 that it's a lot of minor fixes all over the place, nothing major stands
 out at all.
 
 All of these have been in linux-next for a while.  There will be a merge
 conflict with Al's vfs tree in the lustre code, but the resolution for
 that should be pretty simple, that too has been in linux-next.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWFAk1Q8cZ3JlZ0Brcm9h
 aC5jb20ACgkQMUfUDdst+ymikACg05b0h/iVTTH18474PXXnzw6jk9IAn0gI2fx9
 cqp2MglTvphhrXzddL7V
 =MeTw
 -----END PGP SIGNATURE-----

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

Pull staging/IIO updates from Greg KH:
 "Here's the "big" staging/iio pull request for 4.10-rc1.

  Not as big as 4.9 was, but still just over a thousand changes. We
  almost broke even of lines added vs. removed, as the slicoss driver
  was removed (got a "clean" driver for the same hardware through the
  netdev tree), and some iio drivers were also dropped, but I think we
  ended up adding a few thousand lines to the source tree in the end.
  Other than that it's a lot of minor fixes all over the place, nothing
  major stands out at all.

  All of these have been in linux-next for a while. There will be a
  merge conflict with Al's vfs tree in the lustre code, but the
  resolution for that should be pretty simple, that too has been in
  linux-next"

* tag 'staging-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1002 commits)
  staging: comedi: comedidev.h: Document usage of 'detach' handler
  staging: fsl-mc: remove unnecessary info prints from bus driver
  staging: fsl-mc: add sysfs ABI doc
  staging/lustre/o2iblnd: Fix misspelled attemps->attempts
  staging/lustre/o2iblnd: Fix misspelling intialized->intialized
  staging/lustre: Convert all bare unsigned to unsigned int
  staging/lustre/socklnd: Fix whitespace problem
  staging/lustre/o2iblnd: Add missing space
  staging/lustre/lnetselftest: Fix potential integer overflow
  staging: greybus: audio_module: remove redundant OOM message
  staging: dgnc: Fix lines longer than 80 characters
  staging: dgnc: fix blank line after '{' warnings.
  staging/android: remove Sync Framework tasks from TODO
  staging/lustre/osc: Revert erroneous list_for_each_entry_safe use
  staging: slicoss: remove the staging driver
  staging: lustre: libcfs: remove lnet upcall code
  staging: lustre: remove set but unused variables
  staging: lustre: osc: set lock data for readahead lock
  staging: lustre: import: don't reconnect during connect interpret
  staging: lustre: clio: remove mtime check in vvp_io_fault_start()
  ...
2016-12-13 11:35:00 -08:00
..
Kconfig staging: wilc1000: removes WIRELESS_EXT 2016-03-28 07:30:36 -07:00
Makefile staging: wilc1000: message_queue: Move code to host interface 2016-06-25 14:39:53 -07:00
TODO drivers: wilc1000: remove references to semaphores 2016-08-21 17:27:16 +02:00
coreconfigurator.c Staging: wilc1000: Compress return logic into one line 2016-10-16 10:27:34 +02:00
coreconfigurator.h Staging: wilc1000: Remove struct typedef 2016-09-13 15:13:16 +02:00
host_interface.c Merge 4.9-rc3 into staging-next 2016-10-30 06:38:44 -04:00
host_interface.h staging: wilc1000: Remove unnecessary extern variables. 2016-10-17 09:54:15 +02:00
linux_mon.c staging: wilc1000: use reset to set mac header 2016-12-03 15:49:16 -05:00
linux_wlan.c staging: wilc1000: simplify vif[i]->ndev accesses 2016-11-16 18:30:22 +01:00
wilc_debugfs.c staging: wilc1000: Replace printk() with pr_info(). 2016-10-16 10:26:05 +02:00
wilc_sdio.c staging: wilc1000: Remove unnecessary extern variables. 2016-10-17 09:54:15 +02:00
wilc_spi.c staging: wilc1000: Remove unnecessary extern variables. 2016-10-17 09:54:15 +02:00
wilc_wfi_cfgoperations.c staging: wilc1000: Remove unnecessary extern variables. 2016-10-17 09:54:15 +02:00
wilc_wfi_cfgoperations.h Staging: wilc1000: Remove unused function WILC_WFI_update_stats 2016-02-20 14:43:48 -08:00
wilc_wfi_netdevice.h staging: wilc1000: Remove unused function wilc_lock_timeout 2016-10-25 10:53:27 +02:00
wilc_wlan.c staging: wilc1000: remove unnecessary braces 2016-10-02 17:19:51 +02:00
wilc_wlan.h staging: wilc1000: Remove unnecessary extern variables. 2016-10-17 09:54:15 +02:00
wilc_wlan_cfg.c staging: wilc1000: Replaced comparison to NULL statements 2016-03-28 07:30:36 -07:00
wilc_wlan_cfg.h staging: wilc1000: wilc_wlan_cfg_init: changes unused argument 2016-02-22 11:48:19 -08:00
wilc_wlan_if.h drivers: wilc1000: remove references to semaphores 2016-08-21 17:27:16 +02:00