git.karo-electronics.de Git - karo-tx-linux.git/log

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

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
  ...

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

Linux kernel for KaRo TX COM modules

RSS Atom