]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:22:43 +0000 (11:22 +1100)]
Merge remote-tracking branch 'slab/for-next'

Conflicts:
mm/slob.c

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:22:32 +0000 (11:22 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:20:54 +0000 (11:20 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Fri, 9 Nov 2012 00:19:02 +0000 (11:19 +1100)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:17:19 +0000 (11:17 +1100)]
Merge remote-tracking branch 'block/for-next'

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

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:12:54 +0000 (11:12 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 9 Nov 2012 00:10:51 +0000 (11:10 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:09:08 +0000 (11:09 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:02:11 +0000 (11:02 +1100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 9 Nov 2012 00:00:21 +0000 (11:00 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:58:31 +0000 (10:58 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:56:45 +0000 (10:56 +1100)]
Merge remote-tracking branch 'drm/drm-next'

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:55:05 +0000 (10:55 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:53:26 +0000 (10:53 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:51:45 +0000 (10:51 +1100)]
Merge remote-tracking branch 'mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:50:05 +0000 (10:50 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:47:52 +0000 (10:47 +1100)]
Merge remote-tracking branch 'wireless-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:40:26 +0000 (10:40 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 8 Nov 2012 23:29:10 +0000 (10:29 +1100)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:27:20 +0000 (10:27 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:22:09 +0000 (10:22 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

11 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 8 Nov 2012 23:20:34 +0000 (10:20 +1100)]
Merge remote-tracking branch 'dlm/next'

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

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 8 Nov 2012 23:17:15 +0000 (10:17 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:17:08 +0000 (10:17 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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

11 years agoMerge remote-tracking branch 'acpi/next'
Stephen Rothwell [Thu, 8 Nov 2012 23:10:37 +0000 (10:10 +1100)]
Merge remote-tracking branch 'acpi/next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:10:24 +0000 (10:10 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge commit 'refs/next/20121026/v4l-dvb'
Stephen Rothwell [Thu, 8 Nov 2012 23:09:20 +0000 (10:09 +1100)]
Merge commit 'refs/next/20121026/v4l-dvb'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:03:08 +0000 (10:03 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 8 Nov 2012 23:01:28 +0000 (10:01 +1100)]
Merge branch 'jdelvare-hwmon/master'

11 years agoMerge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 23:01:27 +0000 (10:01 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

11 years agoMerge branch 'i2c/master'
Stephen Rothwell [Thu, 8 Nov 2012 22:59:58 +0000 (09:59 +1100)]
Merge branch 'i2c/master'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:58:16 +0000 (09:58 +1100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 8 Nov 2012 22:54:50 +0000 (09:54 +1100)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:53:20 +0000 (09:53 +1100)]
Merge remote-tracking branch 'vfs/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:51:41 +0000 (09:51 +1100)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:50:00 +0000 (09:50 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:49:53 +0000 (09:49 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:48:01 +0000 (09:48 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:46:21 +0000 (09:46 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:44:46 +0000 (09:44 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 8 Nov 2012 22:43:08 +0000 (09:43 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 8 Nov 2012 22:41:37 +0000 (09:41 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:39:51 +0000 (09:39 +1100)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Thu, 8 Nov 2012 22:38:19 +0000 (09:38 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:36:45 +0000 (09:36 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 8 Nov 2012 22:35:08 +0000 (09:35 +1100)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 8 Nov 2012 22:33:38 +0000 (09:33 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

11 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 8 Nov 2012 22:32:07 +0000 (09:32 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 8 Nov 2012 22:30:34 +0000 (09:30 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 8 Nov 2012 22:28:57 +0000 (09:28 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:28:55 +0000 (09:28 +1100)]
Merge remote-tracking branch 'parisc/for-next'

11 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 8 Nov 2012 22:18:47 +0000 (09:18 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:16:47 +0000 (09:16 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 8 Nov 2012 22:15:15 +0000 (09:15 +1100)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:13:41 +0000 (09:13 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 8 Nov 2012 22:12:11 +0000 (09:12 +1100)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:10:40 +0000 (09:10 +1100)]
Merge remote-tracking branch 'cris/for-next'

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

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 8 Nov 2012 22:07:39 +0000 (09:07 +1100)]
Merge remote-tracking branch 'arm64/upstream'

11 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:06:10 +0000 (09:06 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 8 Nov 2012 22:04:35 +0000 (09:04 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 22:02:31 +0000 (09:02 +1100)]
Merge remote-tracking branch 'arm/for-next'

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

11 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Thu, 8 Nov 2012 21:53:49 +0000 (08:53 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'

11 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 8 Nov 2012 21:53:37 +0000 (08:53 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'

11 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 8 Nov 2012 21:53:16 +0000 (08:53 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

11 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 8 Nov 2012 21:53:01 +0000 (08:53 +1100)]
Merge remote-tracking branch 'crypto-current/master'

11 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 8 Nov 2012 21:52:55 +0000 (08:52 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

11 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 8 Nov 2012 21:52:53 +0000 (08:52 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

11 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 8 Nov 2012 21:52:53 +0000 (08:52 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

11 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 8 Nov 2012 21:52:51 +0000 (08:52 +1100)]
Merge remote-tracking branch 'net/master'

11 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Thu, 8 Nov 2012 21:52:51 +0000 (08:52 +1100)]
Merge remote-tracking branch 'sparc/master'

11 years agoMerge remote-tracking branch 'kbuild-current/rc-fixes'
Stephen Rothwell [Thu, 8 Nov 2012 21:52:49 +0000 (08:52 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'

11 years agoMAINTAINERS: i2c: 7 years, this is it
Jean Delvare [Thu, 8 Nov 2012 21:50:56 +0000 (08:50 +1100)]
MAINTAINERS: i2c: 7 years, this is it

I have been maintaining the i2c subsystem for 7 years now, it's about
time to let someone else take over. Just before I leave, I would like
to thank several individuals who made this possible at all:

* Greg Kroah-Hartman, for his faith in my potential subsystem
  maintainer skills. Greg, I hope I met your expectations.
* Late David Brownell, for helping me convert the i2c subsystem to the
  standard device driver model. Rest in peace David, we're missing you.
* Ben Dooks, for stepping in when I asked for someone to take care of
  the huge flow of new i2c adapter drivers for embedded systems.
* Wolfram Sang, for joining the crew when it became clear that there
  was more review work than Ben and myself could deal with.

I hope I did not forget anyone, please forgive me if I did.

Another big thank is due to Wolfram again, who quickly proposed to
take over as the main i2c subsystem maintainer. This will allow for a
smooth and fast transition.

Note that I will keep maintaining all I2C/SMBus controller drivers for
PC systems as well as a few others. I am hereby updating MAINTAINERS
accordingly. I'll also keep maintaining user-space i2c-tools.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
11 years agoi2c: Mention functionality flags in SMBus protocol documentation
Jean Delvare [Thu, 8 Nov 2012 21:50:56 +0000 (08:50 +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>
11 years agoi2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
Joe Perches [Thu, 8 Nov 2012 21:50:55 +0000 (08:50 +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>
11 years agoi2c-i801: Enable interrupts for all post-ICH5 chips
Jean Delvare [Thu, 8 Nov 2012 21:50:55 +0000 (08:50 +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.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Daniel Kurtz <djkurtz@chromium.org>
11 years agoi2c-i801: Add device tree support
Thierry Reding [Thu, 8 Nov 2012 21:50:55 +0000 (08:50 +1100)]
i2c-i801: Add device tree support

Add support for probing slave devices parsed from the device tree.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoMerge branch 'execve' into upstream
Catalin Marinas [Thu, 8 Nov 2012 21:03:53 +0000 (21:03 +0000)]
Merge branch 'execve' into upstream

Conflicts:
arch/arm64/kernel/process.c

11 years agoMerge branch 'bugfixes' into linux-next
Trond Myklebust [Thu, 8 Nov 2012 19:54:23 +0000 (14:54 -0500)]
Merge branch 'bugfixes' into linux-next

11 years agoSUNRPC: Fix validity issues with rpc_pipefs sb->s_fs_info
Trond Myklebust [Thu, 8 Nov 2012 15:01:26 +0000 (10:01 -0500)]
SUNRPC: Fix validity issues with rpc_pipefs sb->s_fs_info

rpc_kill_sb() must defer calling put_net() until after the notifier
has been called, since most (all?) of the notifier callbacks assume
that sb->s_fs_info points to a valid net namespace. It also must not
call put_net() if the call to rpc_fill_super was unsuccessful.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=48421

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
Cc: stable@vger.kernel.org [>= v3.4]
11 years agotarget/iblock: Add WRITE_SAME w/ UNMAP=0 emulation support
Nicholas Bellinger [Thu, 8 Nov 2012 04:08:38 +0000 (20:08 -0800)]
target/iblock: Add WRITE_SAME w/ UNMAP=0 emulation support

This patch adds support for emulation of WRITE_SAME w/ UNMAP=0 within
iblock_execute_write_same() backend code.

The emulation uses a bio_add_page() call for each sector, and by default
enforces a limit of max_write_same_len=0xFFFF (65536) sectors following
what scsi_debug reports per default for MAXIMUM WRITE SAME LENGTH.

It also sets max_write_same_len to the operational default at setup ->
iblock_configure_device() time.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
11 years agoInput: nomadik-ske-keypad - fixup use of clk
Ulf Hansson [Sat, 3 Nov 2012 19:16:51 +0000 (12:16 -0700)]
Input: nomadik-ske-keypad - fixup use of clk

Do proper error handling for clk and make sure clocks are being
prepared|unprepared as well as enabled|disabled.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
11 years agoInput: wacom - add support for 2 new multi-touch tablets (0x100 and 0x101)
Ping Cheng [Sat, 3 Nov 2012 19:16:15 +0000 (12:16 -0700)]
Input: wacom - add support for 2 new multi-touch tablets (0x100 and 0x101)

This adds support for the two new multi-touch tablets.

Signed-off-by: Ping Cheng <pinglinux@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
11 years agoInput: wacom - clean up device type code
Ping Cheng [Sat, 3 Nov 2012 19:16:13 +0000 (12:16 -0700)]
Input: wacom - clean up device type code

Use switch instead of if statement to verify device types

Signed-off-by: Ping Cheng <pinglinux@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
11 years agoInput: introduce managed input devices (add devres support)
Dmitry Torokhov [Sat, 3 Nov 2012 19:16:12 +0000 (12:16 -0700)]
Input: introduce managed input devices (add devres support)

There is a demand from driver's writers to use managed devices framework
for their drivers. Unfortunately up to this moment input devices did not
provide support for managed devices and that lead to mixing two styles
of resource management which usually introduced more bugs, such as
manually unregistering input device but relying in devres to free
interrupt handler which (unless device is properly shut off) can cause
ISR to reference already freed memory.

This change introduces devm_input_allocate_device() that will allocate
managed instance of input device so that driver writers who prefer
using devm_* framework do not have to mix 2 styles.

Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Reviewed-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
11 years agoMerge tag 'v3.7-rc4' into next to sync up Wacom bits
Dmitry Torokhov [Thu, 8 Nov 2012 16:51:52 +0000 (08:51 -0800)]
Merge tag 'v3.7-rc4' into next to sync up Wacom bits

Linux 3.7-rc4

11 years agoALSA: hda - Apply a proper chmap for built-in 2.1 speakers
Takashi Iwai [Thu, 8 Nov 2012 16:12:10 +0000 (17:12 +0100)]
ALSA: hda - Apply a proper chmap for built-in 2.1 speakers

When 2.1 speakers are detected, use the corresponding channel map
instead of the standard map with front+rear surrounds.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoarm64: Make the user fault reporting more specific
Catalin Marinas [Wed, 24 Oct 2012 15:34:02 +0000 (16:34 +0100)]
arm64: Make the user fault reporting more specific

For user space faults the kernel reports "unhandled page fault" and it
gives the ESR value. With this patch the error message looked up in the
fault info array to give a better description.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
11 years agoarm64: mm: fix booting on systems with no memory below 4GB
Will Deacon [Thu, 8 Nov 2012 16:00:16 +0000 (16:00 +0000)]
arm64: mm: fix booting on systems with no memory below 4GB

Booting on a system with all of its memory above the 4GB boundary breaks
for two reasons:

(1) We still try to create a non-empty DMA32 zone
(2) no-bootmem limits allocations to 0xffffffff

This patch fixes these issues for ARM64.

Tested-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
11 years agoarm64: smp: add missing completion for secondary boot
Will Deacon [Wed, 7 Nov 2012 17:00:05 +0000 (17:00 +0000)]
arm64: smp: add missing completion for secondary boot

Commit 149c24151e85 ("ARM: SMP: use a timing out completion for cpu
hotplug") modified arm's CPU up path to use completions. It seems that
we only got half of this patch for arm64, so add the missing call to
complete.

Reported-by: Jon Brawn <jon.brawn@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
11 years agoarm64: compat: select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
Will Deacon [Wed, 7 Nov 2012 14:16:28 +0000 (14:16 +0000)]
arm64: compat: select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION

Commit c1d7e01d7877 ("ipc: use Kconfig options for
__ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION") replaced the
__ARCH_WANT_COMPAT_IPC_PARSE_VERSION token with a corresponding Kconfig
option instead.

This patch updates arm64 to use the latter, rather than #define an
unused token.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
11 years agoarm64: elf: fix core dumping definitions for GP and FP registers
Will Deacon [Tue, 6 Nov 2012 19:28:48 +0000 (19:28 +0000)]
arm64: elf: fix core dumping definitions for GP and FP registers

struct user_fp does not exist for arm64, so use struct user_fpsimd_state
instead for the ELF core dumping definitions. Furthermore, since we use
regset-based core dumping, we do not need definitions for dump_task_regs
and dump_fpu.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
11 years agoarm64: perf: use architected event for CPU cycle counter
Will Deacon [Mon, 5 Nov 2012 12:34:47 +0000 (12:34 +0000)]
arm64: perf: use architected event for CPU cycle counter

We currently use a fake event encoding (0xFF) to indicate CPU cycles so
that we don't waste an event counter and can target the hardware cycle
counter instead.

The problem with this approach is that the event space defined by the
architecture permits an implementation to allocate 0xFF for some other
event.

This patch uses the architected cycle counter encoding (0x11) so that
we avoid potentially clashing with event encodings on future CPU
implementations.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
11 years agoALSA: hda - Give standard "Bass Speaker" mixer for 2.1 speakers
Takashi Iwai [Thu, 8 Nov 2012 14:59:23 +0000 (15:59 +0100)]
ALSA: hda - Give standard "Bass Speaker" mixer for 2.1 speakers

When two built-in speakers are found on the machine, we can suppose
it's rather a 2.1 speaker system with a bass output instead of
front/surround channels.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoMerge branch 'for-linus' into for-next
Takashi Iwai [Thu, 8 Nov 2012 14:58:25 +0000 (15:58 +0100)]
Merge branch 'for-linus' into for-next

11 years agommc: dw_mmc: fix more const pointer warnings
Arnd Bergmann [Thu, 8 Nov 2012 14:26:11 +0000 (14:26 +0000)]
mmc: dw_mmc: fix more const pointer warnings

The patch "dw_mmc: fix multiple drv_data NULL dereferences" has
unfortunately clashed with my "mmc: dw_mmc: constify dw_mci_idmac_ops
in exynos back-end" patch, causing new warnings to appear.

This should hopefully fix the issue for good.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agocgroup: set 'start' with the right value in cgroup_path.
Tao Ma [Thu, 8 Nov 2012 13:36:38 +0000 (21:36 +0800)]
cgroup: set 'start' with the right value in cgroup_path.

'start' is set to buf + buflen and do the '--' immediately.
Just set it to 'buf + buflen - 1' directly.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
11 years agoALSA: Fix card refcount unbalance
Takashi Iwai [Thu, 8 Nov 2012 13:36:18 +0000 (14:36 +0100)]
ALSA: Fix card refcount unbalance

There are uncovered cases whether the card refcount introduced by the
commit a0830dbd isn't properly increased or decreased:
- OSS PCM and mixer success paths
- When lookup function gets NULL

This patch fixes these places.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50251

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>