]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:47:31 +0000 (12:47 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h

11 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 25 Oct 2012 01:40:03 +0000 (12:40 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 25 Oct 2012 01:32:35 +0000 (12:32 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:30:55 +0000 (12:30 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

11 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:29:12 +0000 (12:29 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

11 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 25 Oct 2012 01:27:26 +0000 (12:27 +1100)]
Merge remote-tracking branch 'edac/linux_next'

11 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:25:47 +0000 (12:25 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:18:16 +0000 (12:18 +1100)]
Merge remote-tracking branch 'pm/linux-next'

11 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:16:28 +0000 (12:16 +1100)]
Merge remote-tracking branch 'trivial/for-next'

11 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 25 Oct 2012 01:14:49 +0000 (12:14 +1100)]
Merge remote-tracking branch 'osd/linux-next'

11 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 25 Oct 2012 01:09:38 +0000 (12:09 +1100)]
Merge remote-tracking branch 'iommu/next'

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 25 Oct 2012 01:07:55 +0000 (12:07 +1100)]
Merge remote-tracking branch 'watchdog/master'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 25 Oct 2012 01:07:48 +0000 (12:07 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 25 Oct 2012 01:00:57 +0000 (12:00 +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

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:59:14 +0000 (11:59 +1100)]
Merge remote-tracking branch 'regulator/for-next'

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

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:50:21 +0000 (11:50 +1100)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:50:11 +0000 (11:50 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:48:35 +0000 (11:48 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 25 Oct 2012 00:46:45 +0000 (11:46 +1100)]
Merge branch 'quilt/device-mapper'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:45:00 +0000 (11:45 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:40:38 +0000 (11:40 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 25 Oct 2012 00:38:52 +0000 (11:38 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:37:16 +0000 (11:37 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:30:27 +0000 (11:30 +1100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:28:41 +0000 (11:28 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:26:48 +0000 (11:26 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:25:09 +0000 (11:25 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:23:29 +0000 (11:23 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:21:52 +0000 (11:21 +1100)]
Merge remote-tracking branch 'mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:20:18 +0000 (11:20 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:18:09 +0000 (11:18 +1100)]
Merge remote-tracking branch 'wireless-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:16:14 +0000 (11:16 +1100)]
Merge remote-tracking branch 'net-next/master'

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 25 Oct 2012 00:14:37 +0000 (11:14 +1100)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 25 Oct 2012 00:12:42 +0000 (11:12 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:12:34 +0000 (11:12 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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

11 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:10:41 +0000 (11:10 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:10:29 +0000 (11:10 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 25 Oct 2012 00:10:26 +0000 (11:10 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:08:58 +0000 (11:08 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 25 Oct 2012 00:07:31 +0000 (11:07 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

11 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 25 Oct 2012 00:05:59 +0000 (11:05 +1100)]
Merge branch 'quilt/i2c'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:04:21 +0000 (11:04 +1100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:02:48 +0000 (11:02 +1100)]
Merge remote-tracking branch 'vfs/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 25 Oct 2012 00:01:11 +0000 (11:01 +1100)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:59:35 +0000 (10:59 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:59:28 +0000 (10:59 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:57:40 +0000 (10:57 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:56:06 +0000 (10:56 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 24 Oct 2012 23:54:27 +0000 (10:54 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 24 Oct 2012 23:52:57 +0000 (10:52 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:51:12 +0000 (10:51 +1100)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:49:37 +0000 (10:49 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 24 Oct 2012 23:47:59 +0000 (10:47 +1100)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 24 Oct 2012 23:46:27 +0000 (10:46 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 24 Oct 2012 23:44:55 +0000 (10:44 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 24 Oct 2012 23:43:27 +0000 (10:43 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:43:25 +0000 (10:43 +1100)]
Merge remote-tracking branch 'parisc/for-next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:41:51 +0000 (10:41 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 24 Oct 2012 23:40:19 +0000 (10:40 +1100)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:38:52 +0000 (10:38 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/include/asm/termios.h
arch/m68k/include/uapi/asm/auxvec.h
arch/m68k/include/uapi/asm/msgbuf.h
arch/m68k/include/uapi/asm/sembuf.h
arch/m68k/include/uapi/asm/shmbuf.h
arch/m68k/include/uapi/asm/socket.h
arch/m68k/include/uapi/asm/sockios.h
arch/m68k/include/uapi/asm/termbits.h

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:29:17 +0000 (10:29 +1100)]
Merge remote-tracking branch 'cris/for-next'

11 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:27:50 +0000 (10:27 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Wed, 24 Oct 2012 23:26:21 +0000 (10:26 +1100)]
Merge remote-tracking branch 'arm64/upstream'

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Wed, 24 Oct 2012 23:24:45 +0000 (10:24 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 24 Oct 2012 23:23:14 +0000 (10:23 +1100)]
Merge remote-tracking branch 'arm/for-next'

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

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

11 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Wed, 24 Oct 2012 23:20:02 +0000 (10:20 +1100)]
Merge remote-tracking branch 'crypto-current/master'

11 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:57 +0000 (10:19 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

11 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:57 +0000 (10:19 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'

11 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:56 +0000 (10:19 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

11 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:55 +0000 (10:19 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

11 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:54 +0000 (10:19 +1100)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

11 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:53 +0000 (10:19 +1100)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:52 +0000 (10:19 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

11 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:51 +0000 (10:19 +1100)]
Merge remote-tracking branch 'net/master'

11 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Wed, 24 Oct 2012 23:19:49 +0000 (10:19 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

11 years agotrack_chunk is always called with interrupts enabled. Consequently, we
Mikulas Patocka [Wed, 24 Oct 2012 23:11:18 +0000 (10:11 +1100)]
track_chunk is always called with interrupts enabled. Consequently, we
do not need to save and restore interrupt state in "flags" variable.
This patch changes spin_lock_irqsave to spin_lock_irq and
spin_unlock_irqrestore to spin_unlock_irq.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
11 years agoUse a defined macro DM_ENDIO_INCOMPLETE instead of a numeric constant.
Mikulas Patocka [Wed, 24 Oct 2012 23:11:18 +0000 (10:11 +1100)]
Use a defined macro DM_ENDIO_INCOMPLETE instead of a numeric constant.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
11 years agomempool_alloc can't fail if __GFP_WAIT is specified, so the condition
Mikulas Patocka [Wed, 24 Oct 2012 23:11:18 +0000 (10:11 +1100)]
mempool_alloc can't fail if __GFP_WAIT is specified, so the condition
that tests if read_record is non-NULL is always true.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
11 years agoThis patch fixes a compilation failure on sparc32 by renaming struct node.
Mikulas Patocka [Wed, 24 Oct 2012 23:11:17 +0000 (10:11 +1100)]
This patch fixes a compilation failure on sparc32 by renaming struct node.

struct node is already defined in include/linux/node.h. On sparc32, it
happens to be included through other dependencies and persistent-data
doesn't compile because of conflicting declarations.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
11 years agohwmon: (w83627ehf) Add support for suspend
Jean Delvare [Wed, 24 Oct 2012 23:11:16 +0000 (10:11 +1100)]
hwmon: (w83627ehf) Add support for suspend

On suspend some register values are lost, most notably the Value RAM
areas but also other limits and settings. Restore them on resume.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agohwmon: (w83627hf) Add support for suspend
Jean Delvare [Wed, 24 Oct 2012 23:11:15 +0000 (10:11 +1100)]
hwmon: (w83627hf) Add support for suspend

On suspend some register values are lost, most notably the Value RAM
areas but also other limits. Restore them on resume. On top of that,
some fixups are needed to work around BIOS bugs, in particular when
the BIOS omits running the same initialization sequence on resume
that it does after boot. In that case we have to carry initialization
over suspend.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
11 years agohwmon: Fix chip feature table headers
Jean Delvare [Wed, 24 Oct 2012 23:11:15 +0000 (10:11 +1100)]
hwmon: Fix chip feature table headers

These got broken by recent patches fixing checkpatch warnings in these
drivers. The trick is that the patches themselves looked good, but the
source files after applying them do not. That's why I am not a big fan
of using tabs inside comments.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
11 years agoDrivers: hv: Cleanup error handling in vmbus_open()
K. Y. Srinivasan [Fri, 12 Oct 2012 20:22:42 +0000 (13:22 -0700)]
Drivers: hv: Cleanup error handling in vmbus_open()

Fix a memory leak  in the error handling path in the function vmbus_open().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Jason Wang <jasowang@redhat.com>
Cc: Stable <stable@vger.kernel.org>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoMerge branch 'pm-sleep-next' into linux-next
Rafael J. Wysocki [Wed, 24 Oct 2012 22:22:22 +0000 (00:22 +0200)]
Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device

11 years agodriver core / PM: move the calling to device_pm_remove behind the calling to bus_remo...
LongX Zhang [Wed, 24 Oct 2012 22:21:28 +0000 (00:21 +0200)]
driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device

We hit an hang issue when removing a mmc device on Medfield Android phone by sysfs interface.

device_pm_remove will call pm_runtime_remove which would disable
runtime PM of the device. After that pm_runtime_get* or
pm_runtime_put* will be ignored. So if we disable the runtime PM
before device really be removed, drivers' _remove callback may
access HW even pm_runtime_get* fails. That is bad.

Consider below call sequence when removing a device:
device_del => device_pm_remove
             => class_intf->remove_dev(dev, class_intf)  => pm_runtime_get_sync/put_sync
             => bus_remove_device => device_release_driver => pm_runtime_get_sync/put_sync

remove_dev might call pm_runtime_get_sync/put_sync.
Then, generic device_release_driver also calls pm_runtime_get_sync/put_sync.
Since device_del => device_pm_remove firstly, later _get_sync wouldn't really wake up the device.

I git log -p to find the patch which moves the calling to device_pm_remove ahead.
It's below patch:

commit  775b64d2b6ca37697de925f70799c710aab5849a
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Sat Jan 12 20:40:46 2008 +0100

     PM: Acquire device locks on suspend

     This patch reorganizes the way suspend and resume notifications are
     sent to drivers.  The major changes are that now the PM core acquires
     every device semaphore before calling the methods, and calls to
     device_add() during suspends will fail, while calls to device_del()
     during suspends will block.

     It also provides a way to safely remove a suspended device with the
     help of the PM core, by using the device_pm_schedule_removal() callback
     introduced specifically for this purpose, and updates two drivers (msr
     and cpuid) that need to use it.

As device_pm_schedule_removal is deleted by another patch, we need also revert other parts of the patch,
i.e. move the calling of device_pm_remove after the calling to bus_remove_device.

Signed-off-by: LongX Zhang <longx.zhang@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
11 years agoALSA: sound/usb: remove CONFIG_EXPERIMENTAL
Kees Cook [Tue, 23 Oct 2012 20:04:24 +0000 (13:04 -0700)]
ALSA: sound/usb: remove CONFIG_EXPERIMENTAL

This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: sound/pci/hda: remove CONFIG_EXPERIMENTAL
Kees Cook [Tue, 23 Oct 2012 20:04:22 +0000 (13:04 -0700)]
ALSA: sound/pci/hda: remove CONFIG_EXPERIMENTAL

This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: sound/isa: remove CONFIG_EXPERIMENTAL
Kees Cook [Tue, 23 Oct 2012 20:04:21 +0000 (13:04 -0700)]
ALSA: sound/isa: remove CONFIG_EXPERIMENTAL

This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: sound/drivers: remove CONFIG_EXPERIMENTAL
Kees Cook [Tue, 23 Oct 2012 20:04:20 +0000 (13:04 -0700)]
ALSA: sound/drivers: remove CONFIG_EXPERIMENTAL

This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agostaging: ipack: add missing include (implicit declaration of function 'kfree')
Sergei Trofimovich [Wed, 24 Oct 2012 10:43:47 +0000 (13:43 +0300)]
staging: ipack: add missing include (implicit declaration of function 'kfree')

On ARCH=alpha make allmodconfig:

linux-2.6/drivers/staging/ipack/bridges/tpci200.c: In function 'tpci200_free_irq':
linux-2.6/drivers/staging/ipack/bridges/tpci200.c:188:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
linux-2.6/drivers/staging/ipack/bridges/tpci200.c: In function 'tpci200_request_irq':
linux-2.6/drivers/staging/ipack/bridges/tpci200.c:215:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]

Fixed by adding <linux/slab.h> header

CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
CC: Jens Taprogge <jens.taprogge@taprogge.org>
CC: "Miguel Gómez" <magomez@igalia.com>
CC: devel@driverdev.osuosl.org
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agousb-storage: add unusual_devs entry for Casio EX-N1 digital camera
Michael Shigorin [Mon, 22 Oct 2012 09:18:56 +0000 (12:18 +0300)]
usb-storage: add unusual_devs entry for Casio EX-N1 digital camera

This commit sets removable subclass for Casio EX-N1 digital camera.

The patch has been tested within an ALT Linux kernel:
http://git.altlinux.org/people/led/packages/?p=kernel-image-3.0.git;a=commitdiff;h=c0fd891836e89fe0c93a4d536a59216d90e4e3e7

See also https://bugzilla.kernel.org/show_bug.cgi?id=49221

Signed-off-by: Oleksandr Chumachenko <ledest@gmail.com>
Signed-off-by: Michael Shigorin <mike@osdn.org.ua>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoMerge branch 'pm-cpufreq-next' into linux-next
Rafael J. Wysocki [Wed, 24 Oct 2012 21:40:18 +0000 (23:40 +0200)]
Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  cpufreq: return early from __cpufreq_driver_getavg()

11 years agocpufreq: return early from __cpufreq_driver_getavg()
Viresh Kumar [Wed, 24 Oct 2012 21:39:48 +0000 (23:39 +0200)]
cpufreq: return early from __cpufreq_driver_getavg()

There is no need to do cpufreq_get_cpu() and cpufreq_put_cpu() for drivers that
don't support getavg() routine.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
11 years agoMerge branch 'acpi-next' into linux-next
Rafael J. Wysocki [Wed, 24 Oct 2012 20:18:22 +0000 (22:18 +0200)]
Merge branch 'acpi-next' into linux-next

* acpi-next:
  ACPI / PM: Fix device PM kernedoc comments and #ifdefs
  ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
  ACPI / Sleep: add acpi_sleep=nonvs_s3 parameter
  ACPI: Remove unused lockable in acpi_device_flags
  ACPI: Fix stale pointer access to flags.lockable
  ACPI: Fix a hard coding style when determining if a device is a container.
  ACPI / x86: Add quirk for "CheckPoint P-20-00" to not use bridge _CRS_ info
  ACPI / processor: prevent cpu from becoming online
  ACPI: strict_strtoul() and printk() cleanup in acpi_pad
  ACPI: dock: Remove redundant ACPI NS walk
  ACPI / EC: Don't count a SCI interrupt as a false one
  ACPI: Remove the useless check in osl.c
  ACPI / EC: Add more debug info and trivial code cleanup
  ACPI / EC: Cleanup the member name for spinlock/mutex in struct

11 years agoMerge branch 'pm-sleep-next' into linux-next
Rafael J. Wysocki [Wed, 24 Oct 2012 20:18:16 +0000 (22:18 +0200)]
Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*

11 years agoMerge branch 'pm-runtime-next' into linux-next
Rafael J. Wysocki [Wed, 24 Oct 2012 20:18:09 +0000 (22:18 +0200)]
Merge branch 'pm-runtime-next' into linux-next

* pm-runtime-next:
  base: power - use clk_prepare_enable and clk_prepare_disable

11 years agoMerge branch 'pm-opp-next' into linux-next
Rafael J. Wysocki [Wed, 24 Oct 2012 20:17:50 +0000 (22:17 +0200)]
Merge branch 'pm-opp-next' into linux-next

* pm-opp-next:
  PM / OPP: predictable fail results for opp_find* functions, v2
  PM / OPP: Export symbols for module usage.
  PM / OPP: RCU reclaim