]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)]
Merge remote-tracking branch 'modem-shm/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:17:19 +0000 (13:17 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:15:50 +0000 (13:15 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:13:21 +0000 (13:13 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:11:21 +0000 (13:11 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:09:46 +0000 (13:09 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:08:20 +0000 (13:08 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:06:50 +0000 (13:06 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:05:23 +0000 (13:05 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:05:17 +0000 (13:05 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:03:41 +0000 (13:03 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:02:09 +0000 (13:02 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/include/asm/io_apic.h
arch/x86/kernel/apic/io_apic.c
Stephen Rothwell [Tue, 17 Apr 2012 03:02:02 +0000 (13:02 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/include/asm/cmpxchg.h
Stephen Rothwell [Tue, 17 Apr 2012 02:54:53 +0000 (12:54 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 17 Apr 2012 02:47:59 +0000 (12:47 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 17 Apr 2012 02:46:30 +0000 (12:46 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Tue, 17 Apr 2012 02:46:24 +0000 (12:46 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:44:49 +0000 (12:44 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:37:53 +0000 (12:37 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:35:00 +0000 (12:35 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Tue, 17 Apr 2012 02:28:35 +0000 (12:28 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
include/linux/filter.h
Stephen Rothwell [Tue, 17 Apr 2012 02:27:05 +0000 (12:27 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:25:34 +0000 (12:25 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:22:33 +0000 (12:22 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/intel_i2c.c
Stephen Rothwell [Tue, 17 Apr 2012 02:21:03 +0000 (12:21 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:19:36 +0000 (12:19 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:13:06 +0000 (12:13 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:11:37 +0000 (12:11 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:10:03 +0000 (12:10 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 17 Apr 2012 02:06:03 +0000 (12:06 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
Documentation/feature-removal-schedule.txt
Stephen Rothwell [Tue, 17 Apr 2012 02:04:30 +0000 (12:04 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 17 Apr 2012 02:03:02 +0000 (12:03 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/arm/kernel/kprobes.c
drivers/virtio/virtio_balloon.c
init/main.c
Stephen Rothwell [Tue, 17 Apr 2012 02:01:28 +0000 (12:01 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:59:46 +0000 (11:59 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:58:17 +0000 (11:58 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:56:54 +0000 (11:56 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:55:24 +0000 (11:55 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:53:28 +0000 (11:53 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
Stephen Rothwell [Tue, 17 Apr 2012 01:49:17 +0000 (11:49 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:47:52 +0000 (11:47 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 17 Apr 2012 01:46:13 +0000 (11:46 +1000)]
Merge remote-tracking branch 'isci/all'
Stephen Rothwell [Tue, 17 Apr 2012 01:44:28 +0000 (11:44 +1000)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Tue, 17 Apr 2012 01:42:57 +0000 (11:42 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:42:35 +0000 (11:42 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:40:59 +0000 (11:40 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:40:50 +0000 (11:40 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:40:46 +0000 (11:40 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:37:06 +0000 (11:37 +1000)]
Merge commit 'refs/next/
20120410 /v4l-dvb'
Stephen Rothwell [Tue, 17 Apr 2012 01:31:55 +0000 (11:31 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:31:54 +0000 (11:31 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 17 Apr 2012 01:31:52 +0000 (11:31 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Tue, 17 Apr 2012 01:30:29 +0000 (11:30 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 17 Apr 2012 01:29:05 +0000 (11:29 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:21:42 +0000 (11:21 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:20:14 +0000 (11:20 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:18:52 +0000 (11:18 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:17:32 +0000 (11:17 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:16:09 +0000 (11:16 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:13:21 +0000 (11:13 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 17 Apr 2012 01:11:58 +0000 (11:11 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 17 Apr 2012 01:10:36 +0000 (11:10 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Conflicts:
fs/ecryptfs/ecryptfs_kernel.h
Stephen Rothwell [Tue, 17 Apr 2012 01:09:11 +0000 (11:09 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:03:22 +0000 (11:03 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:02:01 +0000 (11:02 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:00:45 +0000 (11:00 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 17 Apr 2012 00:59:27 +0000 (10:59 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:09 +0000 (10:58 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:08 +0000 (10:58 +1000)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:07 +0000 (10:58 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:06 +0000 (10:58 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:56:45 +0000 (10:56 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:55:25 +0000 (10:55 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:54:05 +0000 (10:54 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 17 Apr 2012 00:52:45 +0000 (10:52 +1000)]
Merge remote-tracking branch 'hexagon/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:51:25 +0000 (10:51 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:50:04 +0000 (10:50 +1000)]
Merge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:11 +0000 (10:38 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:07 +0000 (10:38 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:06 +0000 (10:38 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:05 +0000 (10:38 +1000)]
Merge remote-tracking branch 'net/master'
Theodore Ts'o [Mon, 16 Apr 2012 22:55:26 +0000 (18:55 -0400)]
ext4: fix handling of journalled quota options
Commit
26092bf5 broke handling of journalled quota mount options by
trying to parse argument of every mount option as a number. Fix this
by dealing with the quota options before we call match_int().
Thanks to Jan Kara for discovering this regression.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Dan Carpenter [Fri, 13 Apr 2012 19:06:58 +0000 (22:06 +0300)]
workqueue: change BUG_ON() to WARN_ON()
This BUG_ON() can be triggered if you call schedule_work() before
calling INIT_WORK(). It is a bug definitely, but it's nicer to just
print a stack trace and return.
Reported-by: Matt Renzelmann <mjr@cs.wisc.edu>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Sam Ravnborg [Mon, 16 Apr 2012 19:50:49 +0000 (21:50 +0200)]
sparc32: fix build of pcic
Left-overs for an earlier iteration of the generic clock events patch removed.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kirill Tkhai <tkhai@yandex.ru>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Konrad Rzeszutek Wilk [Mon, 16 Apr 2012 21:08:18 +0000 (17:08 -0400)]
Merge branch 'stable/frontswap.v14' into linux-next
* stable/frontswap.v14:
MAINTAINER: Add myself for the frontswap API
mm: frontswap: config and doc files
mm: frontswap: core frontswap functionality
mm: frontswap: core swap subsystem hooks and headers
mm: frontswap: add frontswap header file
Konrad Rzeszutek Wilk [Mon, 16 Apr 2012 21:08:01 +0000 (17:08 -0400)]
Merge commit 'v3.4-rc2' into linux-next
* commit 'v3.4-rc2': (3021 commits)
Linux 3.4-rc2
tcm_fc: Do not free tpg structure during wq allocation failure
tcm_fc: Add abort flag for gracefully handling exchange timeout
MAINTAINERS: Update git url for ACPI
Make the "word-at-a-time" helper functions more commonly usable
cpuidle: Fix panic in CPU off-lining with no idle driver
xen/pcifront: avoid pci_frontend_enable_msix() falsely returning success
xen/pciback: fix XEN_PCI_OP_enable_msix result
xen/smp: Remove unnecessary call to smp_processor_id()
xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'
xen: only check xen_platform_pci_unplug if hvm
net: fix a race in sock_queue_err_skb()
netlink: fix races after skb queueing
doc, net: Update ndo_start_xmit return type and values
doc, net: Remove instruction to set net_device::trans_start
doc, net: Update netdev operation names
doc, net: Update documentation of synchronisation for TX multiqueue
doc, net: Remove obsolete reference to dev->poll
ethtool: Remove exception to the requirement of holding RTNL lock
blackfin: update defconfig for bf527-ezkit
...
Konrad Rzeszutek Wilk [Mon, 16 Apr 2012 21:07:39 +0000 (17:07 -0400)]
Revert "Merge branch 'stable/frontswap.v13' into linux-next"
This reverts commit
80549e89d54a6f25b898112d58b2748d888460b1 , reversing
changes made to
16c0cfa425b8e1488f7a1873bd112a7a099325f0 .
Conflicts:
mm/swapfile.c
Konrad Rzeszutek Wilk [Mon, 16 Apr 2012 21:06:35 +0000 (17:06 -0400)]
MAINTAINER: Add myself for the frontswap API
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Paul Gortmaker [Mon, 16 Apr 2012 19:24:32 +0000 (21:24 +0200)]
mfd: Fix modular builds of rc5t583 regulator support
The combination of commit
1b1247dd75aa5cf5fae54a3bec7280046e9c7957
"mfd: Add support for RICOH PMIC RC5T583"
and commit
6ffc3270210efa2bea526953a142ffc908f5bd86
"regulator: Add support for RICOH PMIC RC5T583 regulator"
are causing the i386 allmodconfig builds to fail with this:
ERROR: "rc5t583_update" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_set_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_clear_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_read" [drivers/regulator/rc5t583-regulator.ko] undefined!
and this:
ERROR: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
For the 1st four, make the simple ops static inline, instead of
polluting the namespace with trivial exports. For the last one,
add an EXPORT_SYMBOL.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Mark Brown [Mon, 16 Apr 2012 18:58:11 +0000 (19:58 +0100)]
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/drivers' and 'regulator/topic/regmap' into regulator-next
Axel Lin [Mon, 16 Apr 2012 10:44:23 +0000 (18:44 +0800)]
regulator: core: Add checking set_mode callback in regulator_set_optimum_mode
regulator_set_optimum_mode needs set_mode to properly work.
Add checking for set_mode callback in case it may be not implemented.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Axel Lin [Mon, 16 Apr 2012 11:03:09 +0000 (19:03 +0800)]
regulator: tps65023: Use generic regmap enable/disable operations
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Mark Brown [Sun, 15 Apr 2012 11:38:52 +0000 (12:38 +0100)]
regulator: wm831x-ldo: Use generic regmap enable/disable operations
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown [Sun, 15 Apr 2012 11:38:42 +0000 (12:38 +0100)]
regulator: wm831x-dcdc: Use generic regmap enable/disable operations
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown [Sun, 15 Apr 2012 11:37:47 +0000 (12:37 +0100)]
regulator: core: Provide standard enable operations for regmap users
Since the enable(), disable() and is_enabled() operations for most regmap
based regulators come down to reading and updating a single register bit
we can factor out the code and allow these drivers to just define which
bit to update using the enable_reg and enable_mask fields in their desc
and then use operations provided by the core.
As well as the code saving this opens the door to future optimisation of
the bulk operations - if the core can realise that we are updating a
single register for multiple regulators then it should be able to combine
these updates into a single physical operation.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown [Sun, 15 Apr 2012 10:25:36 +0000 (11:25 +0100)]
regulator: wm8994: Use core voltage selector operations
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown [Sun, 15 Apr 2012 10:55:55 +0000 (11:55 +0100)]
regulator: wm831x-ldo: Use regulator_get_voltage_sel_regmap()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown [Sun, 15 Apr 2012 10:55:34 +0000 (11:55 +0100)]
regulator: wm831x-dcdc: Use regulator_get_voltage_sel_regmap()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown [Sun, 15 Apr 2012 10:23:30 +0000 (11:23 +0100)]
regulator: core: Provide regmap based voltage_sel operations
Since the voltage selector operations are intended to directly map a
bitfield in the device register map into regulator API operations the
code for implementing them is usually very standard we can save some
code by providing standard implementations for devices using the regmap
API.
Drivers using regmap can pass their regmap in in the regmap_config
struct, set vsel_reg and vsel_mask in their regulator_desc and then
use regulator_{get,set}_voltage_sel_regmap in their ops. This saves
a small amount of code from each driver.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>