averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity
361,751 Commits 116 Branches 5,777 Tags
ef994fda44d6b55ffef7bfdf06f645ff2ab1ab1a
Commit Graph
361751 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Kroah-Hartman ef994fda44 Merge tag 'iio-for-3.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next 
Jonathan writes:

First set of IIO new drivers and cleanup for the 3.10 cycle.

New stuff

1) Add OF support for specifying mappings between iio devices and their
   in kernel consumers.
2) Driver for AD7923 (extra functionality and support for ad7904, ad7914 and
   ad7924 added later in series)
3) Driver for Exynos adc (dt suppor for phy added later in series).
4) Make iio_push_event save IRQ context - necessary if it is to be used
   within an interrupt handler.  Users of this functionality to follow.
5) For iio use the device tree node name to provide the hwmon name attribute
   if available.

Removal and moves out of staging

1) Drop the adt7410 driver from IIO now that there is a hmwon driver with
   equivalent support. This device is very much targeted at hardware
   monitoring so hwmon is a more appropriate host for the driver.
2) Move iio_hwmon driver to drivers/hwmon.

Cleanups

1) Minor cleanup in ST common library.
2) Large set of patches to break the info_mask element which previously used
odd and even bits to specify if a channel attribute was either shared across
similar channels or specific to only one.  Now we have two bitmaps, one for
those parameters that are specific to this channel and one for those shared
by all channels with the same type as this one.  This has no effect on the
userspace abi. It simplifies the core code and provides more space for new
channel parameters. It has been on the todo list for a long time!

Conflicts:
	drivers/iio/dac/ad5064.c
 2013-03-25 10:50:03 -07:00
Jonathan Cameron 51b53dc991 hwmon: Move the IIO client driver for hwmon out of staging 
This driver uses channel maps, defined either through device tree
or platform data, to create a hwmon driver which acts as a client
for the underlying IIO device channels.  Thus a general purpose
IIO adc driver can be used to provide hardware monitoring using a subset
of its channels.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>

--
 The only non move changes here concern the description and changes to the
 dependencies to IIO explicit and hwmon implicit.

 I'm proposing moving this into hwmon on the basis of placing drivers
 based on what they provide rather than what their underlying hardware
 is.

 drivers/hwmon/Kconfig           |   9 ++
 drivers/hwmon/Makefile          |   1 +
 drivers/hwmon/iio_hwmon.c       | 196 ++++++++++++++++++++++++++++++++++++++++
 drivers/staging/iio/Kconfig     |   8 --
 drivers/staging/iio/Makefile    |   2 -
 drivers/staging/iio/iio_hwmon.c | 196 ----------------------------------------
 6 files changed, 206 insertions(+), 206 deletions(-)
 2013-03-23 10:08:15 +00:00
Guenter Roeck 3465a22488 staging/iio: iio_hwmon: Use device tree node name for hwmon name attribute 
So far, all instances of iio_hwmon set their hwmon name attribute
to "iio_hwmon", which is not very descriptive. Set it to the device tree
node name if available, and only revert to iio_hwmon otherwise.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
 2013-03-20 21:37:59 +00:00
Wanpeng Li 25eeb66759 zram: fix zram_bvec_read duplicate dump failure message and stat accumulation 
When zram decompress fails, the code unnecessarily dumps failure messages and
does stat accumulation in function zram_decompress_page(), this work is already
done in function zram_decompress_page, the patch skips the redundant work.

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:42:34 -07:00
Wanpeng Li dcb4e2d9bb staging: zcache: introduce zero filled pages handler 
Introduce zero-filled pages handler to capture and handle zero pages.

Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:24:35 -07:00
Konrad Rzeszutek Wilk ad3c025b35 zcache/TODO: Update on two items. 
Two of them (zcache DebugFS cleanup) and the module loading
capability are now in linux-next for v3.10.

Also Bob Liu is full-time going to help on knocking these items
off the list.

CC: bob.liu@oracle.com
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:24:35 -07:00
Joe Perches 180071a1c3 staging:vt6655:wroute: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches f9cf92bfc6 staging:vt6655:wpactl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches 3e28383f2d staging:vt6655:wpa2: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches f0c35239af staging:vt6655:wpa: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches cb850a64d1 staging:vt6655:wmgr: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:39 -07:00
Joe Perches e2b8c6d3a5 staging:vt6655:wctl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 3bd1a38ba8 staging:vt6655:wcmd: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches d9d644edc3 staging:vt6655:vntwifi: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 031d3996ec staging:vt6655:upc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 76dffe6435 staging:vt6655:ttype: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 5fd36ba5f5 staging:vt6655:tkip: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 947f9a0273 staging:vt6655:tether: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 9eb6c75336 staging:vt6655:tcrc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:38 -07:00
Joe Perches 0c979148d2 staging:vt6655:srom: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 547f1cffdc staging:vt6655:rxtx: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 3bd1996e3a staging:vt6655:rf: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 7e58568f13 staging:vt6655:rc4: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches 474f0f89ef staging:vt6655:power: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches a51ff9058c staging:vt6655:michael: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches fd0badb8ed staging:vt6655:mib: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:37 -07:00
Joe Perches c3504bfd11 staging:vt6655:mac: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches d82adcabc6 staging:vt6655:key: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 6da16f9655 staging:vt6655:iwctl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 722bf5eef7 staging:vt6655:iowpa: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 281c7462f1 staging:vt6655:ioctl: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 5f256874a5 staging:vt6655:iocmd: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 4b61d809a5 staging:vt6655:hostap: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:36 -07:00
Joe Perches 22c5291e70 staging:vt6655:dpc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 915006cddc staging:vt6655:device_main: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 74533af4b6 staging:vt6655:device_cfg: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 4ec4aa4ae0 staging:vt6655:device: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 78a717d827 staging:vt6655:desc: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches b8314cfc88 staging:vt6655:datarate: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 9aa69c9ad0 staging:vt6655:country: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:35 -07:00
Joe Perches 86fcb55d07 staging:vt6655:channel: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches d4945f09dd staging:vt6655:card: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches e1c7757938 staging:vt6655:bssdb: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches 375293671a staging:vt6655:baseband: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches 659b4d97ff staging:vt6655:aes_ccmp: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches b776000227 staging:vt6655:IEEE11h: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches ab4622cca5 staging:vt6655:80211mgr: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:34 -07:00
Joe Perches d74e97699a staging:vt6655:80211hdr: Whitespace cleanups 
Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 17:21:33 -07:00
Greg Kroah-Hartman c45bb8cb72 Merge 3.9-rc3 into staging-next 
This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2013-03-18 09:34:14 -07:00
Linus Torvalds a937536b86 Linux 3.9-rc3 v3.9-rc3 2013-03-17 15:59:32 -07:00