]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:32:36 +0000 (13:32 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:30:57 +0000 (13:30 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

12 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 1 Nov 2012 02:29:10 +0000 (13:29 +1100)]
Merge remote-tracking branch 'edac/linux_next'

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:27:31 +0000 (13:27 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c

12 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:19:58 +0000 (13:19 +1100)]
Merge remote-tracking branch 'pm/linux-next'

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:18:13 +0000 (13:18 +1100)]
Merge remote-tracking branch 'trivial/for-next'

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:16:34 +0000 (13:16 +1100)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 1 Nov 2012 02:11:23 +0000 (13:11 +1100)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 1 Nov 2012 02:09:36 +0000 (13:09 +1100)]
Merge remote-tracking branch 'watchdog/master'

12 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 1 Nov 2012 02:09:29 +0000 (13:09 +1100)]
Merge remote-tracking branch 'selinux/master'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 1 Nov 2012 02:02:38 +0000 (13:02 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 02:00:53 +0000 (13:00 +1100)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:59:01 +0000 (12:59 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:51:41 +0000 (12:51 +1100)]
Merge remote-tracking branch 'slab/for-next'

Conflicts:
mm/slob.c

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:45:38 +0000 (12:45 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:43:59 +0000 (12:43 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

12 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 1 Nov 2012 01:42:14 +0000 (12:42 +1100)]
Merge branch 'quilt/device-mapper'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:40:34 +0000 (12:40 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/block/floppy.c
init/Kconfig

12 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:36:10 +0000 (12:36 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 1 Nov 2012 01:34:32 +0000 (12:34 +1100)]
Merge remote-tracking branch 'input/next'

12 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:32:55 +0000 (12:32 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

12 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:26:07 +0000 (12:26 +1100)]
Merge remote-tracking branch 'modules/modules-next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:24:21 +0000 (12:24 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:22:32 +0000 (12:22 +1100)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 1 Nov 2012 01:20:49 +0000 (12:20 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 1 Nov 2012 01:19:11 +0000 (12:19 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

12 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 1 Nov 2012 01:17:35 +0000 (12:17 +1100)]
Merge remote-tracking branch 'mtd/master'

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 1 Nov 2012 01:15:56 +0000 (12:15 +1100)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 1 Nov 2012 01:13:48 +0000 (12:13 +1100)]
Merge remote-tracking branch 'wireless-next/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 1 Nov 2012 01:09:50 +0000 (12:09 +1100)]
Merge remote-tracking branch 'net-next/master'

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 1 Nov 2012 01:05:52 +0000 (12:05 +1100)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 01:04:03 +0000 (12:04 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

12 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:58:55 +0000 (11:58 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

12 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:57:18 +0000 (11:57 +1100)]
Merge remote-tracking branch 'ubi/linux-next'

12 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 1 Nov 2012 00:55:40 +0000 (11:55 +1100)]
Merge remote-tracking branch 'thermal/next'

12 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:55:33 +0000 (11:55 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

12 years agoMerge remote-tracking branch 'acpi/next'
Stephen Rothwell [Thu, 1 Nov 2012 00:49:03 +0000 (11:49 +1100)]
Merge remote-tracking branch 'acpi/next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:48:51 +0000 (11:48 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge commit 'refs/next/20121026/v4l-dvb'
Stephen Rothwell [Thu, 1 Nov 2012 00:46:59 +0000 (11:46 +1100)]
Merge commit 'refs/next/20121026/v4l-dvb'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:44:35 +0000 (11:44 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 1 Nov 2012 00:43:07 +0000 (11:43 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 1 Nov 2012 00:41:38 +0000 (11:41 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:40:02 +0000 (11:40 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:38:32 +0000 (11:38 +1100)]
Merge remote-tracking branch 'vfs/for-next'

12 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:36:57 +0000 (11:36 +1100)]
Merge remote-tracking branch 'xfs/for-next'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:35:23 +0000 (11:35 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:35:16 +0000 (11:35 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:33:25 +0000 (11:33 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:31:51 +0000 (11:31 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 1 Nov 2012 00:30:13 +0000 (11:30 +1100)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 1 Nov 2012 00:28:38 +0000 (11:28 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:26:57 +0000 (11:26 +1100)]
Merge remote-tracking branch 'fuse/for-next'

12 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:25:19 +0000 (11:25 +1100)]
Merge remote-tracking branch 'cifs/for-next'

12 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 1 Nov 2012 00:23:43 +0000 (11:23 +1100)]
Merge remote-tracking branch 'ceph/master'

12 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 1 Nov 2012 00:22:13 +0000 (11:22 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 1 Nov 2012 00:20:46 +0000 (11:20 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 1 Nov 2012 00:19:14 +0000 (11:19 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 1 Nov 2012 00:17:39 +0000 (11:17 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:17:36 +0000 (11:17 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 1 Nov 2012 00:16:06 +0000 (11:16 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:14:33 +0000 (11:14 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 1 Nov 2012 00:13:00 +0000 (11:13 +1100)]
Merge remote-tracking branch 'microblaze/next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:11:31 +0000 (11:11 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:09:56 +0000 (11:09 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 1 Nov 2012 00:08:25 +0000 (11:08 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 1 Nov 2012 00:06:50 +0000 (11:06 +1100)]
Merge remote-tracking branch 'arm64/upstream'

12 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:05:21 +0000 (11:05 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'

12 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 1 Nov 2012 00:03:53 +0000 (11:03 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 00:02:21 +0000 (11:02 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Thu, 1 Nov 2012 00:00:50 +0000 (11:00 +1100)]
Merge remote-tracking branch 'asm-generic/master'

12 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:59 +0000 (10:58 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'

12 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:47 +0000 (10:58 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'

12 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:35 +0000 (10:58 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

12 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:26 +0000 (10:58 +1100)]
Merge remote-tracking branch 'crypto-current/master'

12 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:23 +0000 (10:58 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

12 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:22 +0000 (10:58 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

12 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:20 +0000 (10:58 +1100)]
Merge remote-tracking branch 'net/master'

12 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:19 +0000 (10:58 +1100)]
Merge remote-tracking branch 'sparc/master'

12 years agoMerge remote-tracking branch 'kbuild-current/rc-fixes'
Stephen Rothwell [Wed, 31 Oct 2012 23:58:18 +0000 (10:58 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'

12 years agohwmon: (it87) Report thermal sensor type as Intel PECI if appropriate
Guenter Roeck [Wed, 31 Oct 2012 23:18:31 +0000 (10:18 +1100)]
hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate

IT8721 and IT8728 support Intel PECI temperature reporting. Each sensor
can be programmed to display the temperature reported on the PECI interface.

If configured for Intel PECI, the driver reported the wrong sensor type for
the respective thermal sensor. Fix the code to correctly report it as
"Intel PECI (6)".

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Manage device specific features with table
Guenter Roeck [Wed, 31 Oct 2012 23:18:31 +0000 (10:18 +1100)]
hwmon: (it87) Manage device specific features with table

This simplifies the code, improves runtime performance, reduces
code size (about 280 bytes on x86_64), and makes it easier
to add support for new devices.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Replace pwm group macro with direct attribute definitions
Guenter Roeck [Wed, 31 Oct 2012 23:18:30 +0000 (10:18 +1100)]
hwmon: (it87) Replace pwm group macro with direct attribute definitions

Fix checkpatch error:

ERROR: Macros with multiple statements should be enclosed in a do - while loop

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Avoid quoted string splits across lines
Guenter Roeck [Wed, 31 Oct 2012 23:18:30 +0000 (10:18 +1100)]
hwmon: (it87) Avoid quoted string splits across lines

Fix the respective checkpatch warnings.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Save fan registers in 2-dimensional array
Guenter Roeck [Wed, 31 Oct 2012 23:18:30 +0000 (10:18 +1100)]
hwmon: (it87) Save fan registers in 2-dimensional array

Also unify fan functions to use the same code for 8 and 16 bit fans.

This patch reduces code size by approximately 1,200 bytes on x86_64.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Introduce support for tempX_offset sysfs attribute
Guenter Roeck [Wed, 31 Oct 2012 23:18:29 +0000 (10:18 +1100)]
hwmon: (it87) Introduce support for tempX_offset sysfs attribute

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Replace macro defining tempX_type sensors with direct definitions
Guenter Roeck [Wed, 31 Oct 2012 23:18:29 +0000 (10:18 +1100)]
hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions

The macro name show_sensor_offset is confusing since it related to the sensor
type, not an offset - even more so when we introduce offset attributes later on.
Replace it with direct definitions, and replace the show_sensor/set_sensor
function names with show_temp_type/set_temp_type. This also resolves a
checkpatch error.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Save voltage register values in 2-dimensional array
Guenter Roeck [Wed, 31 Oct 2012 23:18:29 +0000 (10:18 +1100)]
hwmon: (it87) Save voltage register values in 2-dimensional array

Reduces code size (more than 600 bytes on x86_64),
and gets rid of some checkpatch errors.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Save temperature registers in 2-dimensional array
Guenter Roeck [Wed, 31 Oct 2012 23:18:28 +0000 (10:18 +1100)]
hwmon: (it87) Save temperature registers in 2-dimensional array

Cleaner code, fewer checkpatch errors, and reduced code size
(saves more than 500 bytes on x86-64).

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (w83627ehf) Get rid of smatch warnings
Jean Delvare [Wed, 31 Oct 2012 23:18:28 +0000 (10:18 +1100)]
hwmon: (w83627ehf) Get rid of smatch warnings

The smatch static code analyzer complains:

drivers/hwmon/w83627ehf.c:911 w83627ehf_update_device() error: buffer overflow 'W83627EHF_REG_TEMP_OFFSET' 3 <= 8
drivers/hwmon/w83627ehf.c:909 w83627ehf_update_device() error: buffer overflow 'data->temp_offset' 3 <= 8
drivers/hwmon/w83627ehf.c:2672 w83627ehf_resume() error: buffer overflow 'W83627EHF_REG_TEMP_OFFSET' 3 <= 8
drivers/hwmon/w83627ehf.c:2673 w83627ehf_resume() error: buffer overflow 'data->temp_offset' 3 <= 8

A deeper analysis of the code shows that these are false positives, as
only the lower 3 bits of data->have_temp_offset can be set so the
write is never attempted with i >= 3. However this shows that the code
isn't very robust and future changes could easily introduce a buffer
overflow. So let's add a safety check to prevent that and make smatch
happy.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Huewe <PeterHuewe@gmx.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
12 years agoi2c: Mention functionality flags in SMBus protocol documentation
Jean Delvare [Wed, 31 Oct 2012 23:18:25 +0000 (10:18 +1100)]
i2c: Mention functionality flags in SMBus protocol documentation

While the mapping between I2C adapter functionality flags and
i2c_smbus_*() helper functions is rather obvious, let's still document
it for clarity.

Also drop the reference to 2 command byte I2C block reads, there is no
support for that in the kernel at the moment.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoi2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
Joe Perches [Wed, 31 Oct 2012 23:18:25 +0000 (10:18 +1100)]
i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.
Coalesce formats for easier grep.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoi2c-i801: Enable interrupts for all post-ICH5 chips
Jean Delvare [Wed, 31 Oct 2012 23:18:24 +0000 (10:18 +1100)]
i2c-i801: Enable interrupts for all post-ICH5 chips

I did not receive a single bug report after interrupt support was
added for a limited number of chips. So I'd say the code is good and
should be enabled for all supported chips, that is: ICH5 and later.

For now the IDF channels are excluded as I have no idea if they
support interrupts too or not.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Daniel Kurtz <djkurtz@chromium.org>
12 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Linus Torvalds [Wed, 31 Oct 2012 22:42:08 +0000 (15:42 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull scsi target fixes from Nicholas Bellinger:
 "These are the current target pending fixes headed for v3.7-rc4 code.
  This includes the following highlights:

   - Fix long-standing qla2xxx target bug where certain fc_port_t state
     transitions could cause the internal session b-tree list to become
     out-of-sync.  (Roland)
   - Fix task management double free of se_cmd descriptor in exception
     path for users of target_submit_tmr().  (nab)
   - Re-introduce simple NOP emulation of REZERO_UNIT, SEEK_6, and
     SEEK_10 SCSI-2 commands in order to support legacy initiators that
     still require them.  (Bernhard)

  Note these three patches are also CC'ed to stable.

  Also, there a couple of outstanding (external) regressions that are
  still being tracked down for tcm_fc(FCoE) and tcm_vhost fabrics for
  v3.7.0 code, so please expect another PULL as these issues identified
  -> resolved."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: reintroduce some obsolete SCSI-2 commands
  target: Fix double-free of se_cmd in target_complete_tmr_failure
  qla2xxx: Update target lookup session tables when a target session changes
  tcm_qla2xxx: Format VPD page 83h SCSI name string according to SPC
  qla2xxx: Add missing ->vport_slock while calling qlt_update_vp_map

12 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Wed, 31 Oct 2012 22:40:21 +0000 (15:40 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull nouveau fixes from Dave Airlie:
 "Just a nouveau set, since we have a couple of reports on lkml and
  dri-devel of regressions that this should fix I sent it along on its
  own."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: headless mode by default if pci class != vga display
  drm/nouveau: resurrect headless mode since rework
  drm/nv50/fb: prevent oops on chipsets without compression tags
  drm/nouveau: allow creation of zero-sized mm
  drm/nouveau/i2c: fix typo when checking nvio i2c port validity
  drm/nouveau: silence modesetting spam on pre-gf8 chipsets

12 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Linus Torvalds [Wed, 31 Oct 2012 22:39:28 +0000 (15:39 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:
 "This contains fixes for two devices by Jiri Slaby and Xianhan Yu, new
  device IDs for MacBook Pro 10,2 from Dirk Hohndel and generic
  multitouch code fix from Alan Cox."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add support for the MacBook Pro 10,2 keyboard / touchpad
  HID: multitouch: fix maxcontacts problem on GeneralTouch
  HID: multitouch: put the case in the right switch statement
  HID: microsoft: fix invalid rdesc for 3k kbd

12 years agoMerge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Linus Torvalds [Wed, 31 Oct 2012 22:38:32 +0000 (15:38 -0700)]
Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "This contains unexpectedly many changes in a wide range due to the
  fixes for races at disconnection of USB audio devices.  In the end, we
  end up covering fairly core parts of sound subsystem.

  Other than that, just a few usual small fixes."

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: ice1724: Fix rate setup after resume
  ALSA: Avoid endless sleep after disconnect
  ALSA: Add a reference counter to card instance
  ALSA: usb-audio: Fix races at disconnection in mixer_quirks.c
  ALSA: usb-audio: Use rwsem for disconnect protection
  ALSA: usb-audio: Fix races at disconnection
  ALSA: PCM: Fix some races at disconnection
  ASoC: omap-dmic: Correct functional clock name
  ASoC: zoom2: Fix compile error by including correct header files
  ALSA: hda - Fix mute-LED setup for HP dv5 laptop

12 years agoMerge branch 'acpica-next' into linux-next
Rafael J. Wysocki [Wed, 31 Oct 2012 21:59:04 +0000 (22:59 +0100)]
Merge branch 'acpica-next' into linux-next

* acpica-next: (26 commits)
  ACPICA: Update version to 20121018
  ACPICA: AcpiGetObjectInfo: Add support for ACPI 5 _SUB method
  ACPICA: Update for 64-bit generation of recent error message changes
  ACPICA: Fix externalize name to complete migration to ACPI_MOVE_NAME
  ACPICA: Add starting offset parameter to common dump buffer routine
  ACPICA: Deploy ACPI_MOVE_NAME across ACPICA source base
  ACPICA: Update support for ACPI 5 MPST table
  ACPICA: Enhance error reporting for invalid opcodes and bad ACPI_NAMEs
  ACPICA: Add ACPI_MOVE_NAME macro to optimize 4-byte ACPI_NAME copies
  ACPICA: AcpiExec: Improve algorithm for tracking memory leaks
  ACPICA: Add debug print message for mutex objects that are force-released
  ACPICA: Resource Mgr: Small fix for buffer size calculation
  ACPICA: Remove extra spaces after periods in the Intel license
  ACPICA: Remove extra spaces after periods within comments
  ACPICA: Update local C library module comments for ASCII table
  ACPICA: Fix for predefined name loop during ACPICA initialization
  ACPICA: Fix some typos in comments
  ACPICA: ACPICA core: Cleanup empty lines at file start and end
  ACPICA: Audit/update for ACPICA return macros and debug depth counter
  ACPICA: Fix unmerged acmacros.h divergences.
  ...

12 years agoACPICA: Update version to 20121018
Bob Moore [Wed, 31 Oct 2012 02:28:46 +0000 (02:28 +0000)]
ACPICA: Update version to 20121018

Version 20121018.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
12 years agoACPICA: AcpiGetObjectInfo: Add support for ACPI 5 _SUB method
Bob Moore [Wed, 31 Oct 2012 02:28:38 +0000 (02:28 +0000)]
ACPICA: AcpiGetObjectInfo: Add support for ACPI 5 _SUB method

Now calls _SUB in addition to the other ID methods: _HID, _CID,
and _UID.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
12 years agoACPICA: Update for 64-bit generation of recent error message changes
Bob Moore [Wed, 31 Oct 2012 02:28:27 +0000 (02:28 +0000)]
ACPICA: Update for 64-bit generation of recent error message changes

Fix for errors on printf changes on 64-bit platforms and gcc.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>