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

Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/Kconfig
drivers/Kconfig
drivers/Makefile
drivers/cpufreq/Kconfig
drivers/cpufreq/Makefile

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:48:39 +0000 (11:48 +1000)]

Merge remote-tracking branch 'parisc/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)]

Merge remote-tracking branch 'mips/mips-for-linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:46:04 +0000 (11:46 +1000)]

Merge remote-tracking branch 'microblaze/next'

Conflicts:
arch/microblaze/pci/pci_32.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:37:59 +0000 (11:37 +1000)]

Merge remote-tracking branch 'm68knommu/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:31:58 +0000 (11:31 +1000)]

Merge remote-tracking branch 'm68k/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)]

Merge remote-tracking branch 'ia64/test'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:29:17 +0000 (11:29 +1000)]

Merge remote-tracking branch 'cris/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:29:13 +0000 (11:29 +1000)]

Merge remote-tracking branch 'ux500-core/ux500-core'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:28:00 +0000 (11:28 +1000)]

Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/mach-smdkc210.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:26:34 +0000 (11:26 +1000)]

Merge remote-tracking branch 'msm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:26:30 +0000 (11:26 +1000)]

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mm-imx1.c
arch/arm/mach-imx/mm-imx21.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:24:52 +0000 (11:24 +1000)]

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos4/pm.c
arch/microblaze/include/asm/pci-bridge.h

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:23:25 +0000 (11:23 +1000)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/tlb.h
arch/arm/mm/context.c
arch/arm/mm/proc-v7.S

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:22:08 +0000 (11:22 +1000)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:20:54 +0000 (11:20 +1000)]

Merge remote-tracking branch 'devicetree-current/devicetree/merge'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:20:52 +0000 (11:20 +1000)]

Merge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 26 Jul 2011 01:20:36 +0000 (11:20 +1000)]

Merge remote-tracking branch 'input-current/for-linus'

commit | commitdiff | tree

Joe Thornber [Tue, 26 Jul 2011 00:38:15 +0000 (10:38 +1000)]

Initial EXPERIMENTAL implementation of device-mapper thin provisioning
with snapshot support.  The 'thin' target is used to create instances of
the virtual devices that are hosted in the 'thin-pool' target.  The
thin-pool target provides data sharing among devices.  This sharing is
made possible using the persistent-data library in the previous patch.

The main highlight of this implementation, compared to the previous
implementation of snapshots, is that it allows many virtual devices to
be stored on the same data volume, simplifying administration and
allowing sharing of data between volumes (thus reducing disk usage).

Another big feature is support for arbitrary depth of recursive
snapshots (snapshots of snapshots of snapshots ...).  The previous
implementation of snapshots did this by chaining together lookup tables,
and so performance was O(depth).  This new implementation uses a single
data structure so we don't get this degradation with depth.

For further information and examples of how to use this, please read
Documentation/device-mapper/thin-provisioning.txt

Signed-off-by: Joe Thornber <thornber@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

commit | commitdiff | tree

Joe Thornber [Tue, 26 Jul 2011 00:38:14 +0000 (10:38 +1000)]

The persistent-data library offers a re-usable framework for the storage
and management of on-disk metadata in device-mapper targets.

It's used by the thin-provisioning target in the next patch and in an
upcoming hierarchical storage target.

For further information, please read
Documentation/device-mapper/persistent-data.txt

Signed-off-by: Joe Thornber <thornber@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

commit | commitdiff | tree

Randy Dunlap [Tue, 26 Jul 2011 00:37:47 +0000 (10:37 +1000)]

General cleanups to kernel-parameters.txt:
- add missing $ARCH that are being used/referenced
- alphabetize the parameter restrictions list
- spell "IA-64" as listed in arch/ia64/Kconfig instead of "IA64"
- remove trailing whitespace
- use hyphen in 32-bit etc.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>

commit | commitdiff | tree

Stephen Boyd [Tue, 26 Jul 2011 00:37:47 +0000 (10:37 +1000)]

Usually kernel parameters are documented in kernel-parameters.txt
but user_debug is only documented in the Kconfig. Document the
option and point to the Kconfig help text for more info.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>

commit | commitdiff | tree

Jean Delvare [Tue, 26 Jul 2011 00:37:28 +0000 (10:37 +1000)]

hwmon: (max1111) Avoid extra memory allocations

We can allocate the tx and rx buffers as part of our data structure.
Doing so is faster and spares memory.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Tested-by: Stanislav Brabec <utx@penguin.cz>

commit | commitdiff | tree

Jean Delvare [Tue, 26 Jul 2011 00:37:28 +0000 (10:37 +1000)]

hwmon: (it87) Add chassis intrusion detection support

Add chassis intrusion detection support for all supported devices,
using the standard interface.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

Jean Delvare [Tue, 26 Jul 2011 00:37:28 +0000 (10:37 +1000)]

hwmon: (via-cputemp) Add VID reporting support

At least VIA family 6 model D CPU report the VID settings in a MSR,
so expose the value to user-space. Not sure about model A.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Tested-by: Jeff Rickman <jrickman@myamigos.us>

commit | commitdiff | tree

Jean Delvare [Tue, 26 Jul 2011 00:37:28 +0000 (10:37 +1000)]

hwmon-vid: Add support for VIA family 6 model D CPU

The VIA family 6 model D CPU (C7-D, Eden 90 nm) can use two different
VID tables, we have to check the value of a MSR to decide which one to
use.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Tested-by: Jeff Rickman <jrickman@myamigos.us>

commit | commitdiff | tree

Hans de Goede [Tue, 26 Jul 2011 00:37:27 +0000 (10:37 +1000)]

hwmon: New driver sch5636

This patch adds a new driver for SMSC SCH5636 Super I/O chips.
The chips include an embedded microcontroller for hardware monitoring
solutions, allowing motherboard manufacturers to create their own
custom hwmon solution based upon the SCH5636.

Currently the sch5636 driver only supports the Fujitsu Theseus SCH5636
based hwmon solution. The sch5636 driver runs a sanity check on
loading to ensure it is dealing with a Fujitsu Theseus and not with
another custom SCH5636 based hwmon solution.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

Hans de Goede [Tue, 26 Jul 2011 00:37:27 +0000 (10:37 +1000)]

hwmon: (sch5627) Factor out some code shared with sch5636 driver

This patch adds a new sch56xx-common.ko which contains code which will also
be used in the new sch5636 driver.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

Grant Likely [Tue, 26 Jul 2011 00:37:09 +0000 (10:37 +1000)]

i2c: Allow i2c_add_numbered_adapter() to assign a bus id

Currently, if an i2c bus driver supports both static and dynamic bus
ids, it needs to choose between calling i2c_add_numbered_adapter() and
i2c_add_adapter(). This patch makes i2c_add_numbered_adapter()
redirect to i2c_add_adapter() if the requested bus id is -1.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

LABBE Corentin [Tue, 26 Jul 2011 00:37:08 +0000 (10:37 +1000)]

i2c-ali1535: Fix style issues

This is a fix-style patch for i2c-ali1535 (issues reported by
checkpatch.pl.)

Signed-off-by: LABBE Corentin <corentin.labbe@geomatys.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

Stefan Berger [Fri, 22 Jul 2011 21:39:20 +0000 (17:39 -0400)]

tpm_nsc: Fix bug when loading multiple TPM drivers

This patch fixes kernel bugzilla 34572.

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

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reported-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Tested-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Signed-off-by: James Morris <jmorris@namei.org>

commit | commitdiff | tree

Shirish Pargaonkar [Mon, 20 Jun 2011 21:14:03 +0000 (16:14 -0500)]

cifs: Cleanup: check return codes of crypto api calls

Check return codes of crypto api calls and either log an error or log
an error and return from the calling function with error.

Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

commit | commitdiff | tree

Pavel Shilovsky [Mon, 25 Jul 2011 13:59:10 +0000 (17:59 +0400)]

CIFS: Fix oops while mounting with prefixpath

commit fec11dd9a0109fe52fd631e5c510778d6cbff6cc caused
a regression when we have already mounted //server/share/a
and want to mount //server/share/a/b.

The problem is that lookup_one_len calls __lookup_hash
with nd pointer as NULL. Then __lookup_hash calls
do_revalidate in the case when dentry exists and we end
up with NULL pointer deference in cifs_d_revalidate:

if (nd->flags & LOOKUP_RCU)
return -ECHILD;

Fix this by checking nd for NULL.

Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Shirish Pargaonkar <shirishp@us.ibm.com>
CC: Stable <stable@kernel.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>

commit | commitdiff | tree

Steve French [Mon, 25 Jul 2011 22:04:32 +0000 (22:04 +0000)]

[CIFS] Redundant null check after dereference

Reviewed-by: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

commit | commitdiff | tree

Christoph Hellwig [Sat, 16 Jul 2011 19:24:37 +0000 (15:24 -0400)]

cifs: use cifs_dirent in cifs_save_resume_key

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

Linux kernel for KaRo TX COM modules

RSS Atom