]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 03:25:32 +0000 (13:25 +1000)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 18 Aug 2011 03:25:24 +0000 (13:25 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 18 Aug 2011 03:23:59 +0000 (13:23 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

13 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Thu, 18 Aug 2011 03:23:52 +0000 (13:23 +1000)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

13 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 18 Aug 2011 03:21:26 +0000 (13:21 +1000)]
Merge branch 'quilt/device-mapper'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 03:15:23 +0000 (13:15 +1000)]
Merge remote-tracking branch 'block/for-next'

13 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 18 Aug 2011 03:13:50 +0000 (13:13 +1000)]
Merge remote-tracking branch 'input/next'

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Thu, 18 Aug 2011 03:12:27 +0000 (13:12 +1000)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 18 Aug 2011 03:11:04 +0000 (13:11 +1000)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 03:09:37 +0000 (13:09 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 03:08:03 +0000 (13:08 +1000)]
Merge remote-tracking branch 'sound/for-next'

13 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 18 Aug 2011 03:02:33 +0000 (13:02 +1000)]
Merge remote-tracking branch 'crypto/master'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 18 Aug 2011 03:01:07 +0000 (13:01 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/maps/lantiq-flash.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:59:35 +0000 (12:59 +1000)]
Merge remote-tracking branch 'bluetooth/master'

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:57:52 +0000 (12:57 +1000)]
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:41:12 +0000 (12:41 +1000)]
Merge remote-tracking branch 'net/master'

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 18 Aug 2011 02:37:41 +0000 (12:37 +1000)]
Merge remote-tracking branch 'slave-dma/next'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:37:34 +0000 (12:37 +1000)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:37:28 +0000 (12:37 +1000)]
Merge remote-tracking branch 'swiotlb/master'

13 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:35:48 +0000 (12:35 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

13 years agoMerge remote-tracking branch 'cpupowerutils/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:34:06 +0000 (12:34 +1000)]
Merge remote-tracking branch 'cpupowerutils/master'

13 years agoMerge remote-tracking branch 'acpi/test'
Stephen Rothwell [Thu, 18 Aug 2011 02:32:24 +0000 (12:32 +1000)]
Merge remote-tracking branch 'acpi/test'

13 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:30:46 +0000 (12:30 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:30:38 +0000 (12:30 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:29:11 +0000 (12:29 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 18 Aug 2011 02:27:47 +0000 (12:27 +1000)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:26:22 +0000 (12:26 +1000)]
Merge remote-tracking branch 'hid/for-next'

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:24:52 +0000 (12:24 +1000)]
Merge remote-tracking branch 'xfs/master'

13 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:23:33 +0000 (12:23 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:22:04 +0000 (12:22 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:20:43 +0000 (12:20 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:19:24 +0000 (12:19 +1000)]
Merge remote-tracking branch 'logfs/master'

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:18:04 +0000 (12:18 +1000)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:16:42 +0000 (12:16 +1000)]
Merge remote-tracking branch 'fuse/for-next'

13 years agoMerge remote-tracking branch 'fatfs/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:15:10 +0000 (12:15 +1000)]
Merge remote-tracking branch 'fatfs/master'

13 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 18 Aug 2011 02:13:27 +0000 (12:13 +1000)]
Merge remote-tracking branch 'ext4/dev'

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Thu, 18 Aug 2011 02:05:08 +0000 (12:05 +1000)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 02:02:21 +0000 (12:02 +1000)]
Merge remote-tracking branch 'ceph/for-next'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 18 Aug 2011 02:01:06 +0000 (12:01 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 18 Aug 2011 01:59:53 +0000 (11:59 +1000)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 18 Aug 2011 01:58:39 +0000 (11:58 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 18 Aug 2011 01:57:28 +0000 (11:57 +1000)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 18 Aug 2011 01:56:11 +0000 (11:56 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch '4xx/next'
Stephen Rothwell [Thu, 18 Aug 2011 01:54:57 +0000 (11:54 +1000)]
Merge remote-tracking branch '4xx/next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:53:31 +0000 (11:53 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:52:18 +0000 (11:52 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:51:07 +0000 (11:51 +1000)]
Merge remote-tracking branch 'm68k/for-next'

13 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Thu, 18 Aug 2011 01:49:53 +0000 (11:49 +1000)]
Merge remote-tracking branch 'ia64/test'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:48:30 +0000 (11:48 +1000)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:47:17 +0000 (11:47 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:45:54 +0000 (11:45 +1000)]
Merge remote-tracking branch 's5p/for-next'

13 years agoMerge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:44:37 +0000 (11:44 +1000)]
Merge remote-tracking branch 'msm/for-next'

Conflicts:
arch/arm/mach-msm/io.c

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:43:02 +0000 (11:43 +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/tlb.h

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 18 Aug 2011 01:41:39 +0000 (11:41 +1000)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:43 +0000 (11:38 +1000)]
Merge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'

13 years agoMerge remote-tracking branch 'rmobile-current/rmobile-fixes-for-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:42 +0000 (11:38 +1000)]
Merge remote-tracking branch 'rmobile-current/rmobile-fixes-for-linus'

13 years agoMerge remote-tracking branch 'sh-current/sh-fixes-for-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:41 +0000 (11:38 +1000)]
Merge remote-tracking branch 'sh-current/sh-fixes-for-linus'

13 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:28 +0000 (11:38 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

13 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:26 +0000 (11:38 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'

13 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:25 +0000 (11:38 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

13 years agoMerge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:23 +0000 (11:38 +1000)]
Merge remote-tracking branch 'wireless-current/master'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:22 +0000 (11:38 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'net-current/master'
Stephen Rothwell [Thu, 18 Aug 2011 01:38:21 +0000 (11:38 +1000)]
Merge remote-tracking branch 'net-current/master'

13 years agoInitial EXPERIMENTAL implementation of device-mapper thin provisioning
Joe Thornber [Thu, 18 Aug 2011 01:28:51 +0000 (11:28 +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>
13 years agoThe persistent-data library offers a re-usable framework for the storage
Joe Thornber [Thu, 18 Aug 2011 01:28:51 +0000 (11:28 +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>
13 years agoExport dm_get_md() for the new thin provisioning target to use.
Alasdair G Kergon [Thu, 18 Aug 2011 01:28:50 +0000 (11:28 +1000)]
Export dm_get_md() for the new thin provisioning target to use.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
13 years agoAdd a target feature flag to indicate that a target does not work in
Alasdair G Kergon [Thu, 18 Aug 2011 01:28:50 +0000 (11:28 +1000)]
Add a target feature flag to indicate that a target does not work in
read-only mode.

The thin provisioning target uses this.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
13 years agoIntroduce the concept of a singleton table which contains exactly one target.
Alasdair G Kergon [Thu, 18 Aug 2011 01:28:50 +0000 (11:28 +1000)]
Introduce the concept of a singleton table which contains exactly one target.

If a target type sets the DM_TARGET_SINGLETON feature bit device-mapper
will ensure that any table that includes that target contains no others.

The thin provisioning pool target uses this.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
13 years agoThis patch introduces dm_kcopyd_zero() to make it easy to use
Mikulas Patocka [Thu, 18 Aug 2011 01:28:49 +0000 (11:28 +1000)]
This patch introduces dm_kcopyd_zero() to make it easy to use
kcopyd to write zeros into the requested areas instead
instead of copying.  It is implemented by passing a NULL
copying source to dm_kcopyd_copy().

The forthcoming thin provisioning target uses this.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
13 years agoSince set_current_state() contains a memory barrier in it,
Namhyung Kim [Thu, 18 Aug 2011 01:28:49 +0000 (11:28 +1000)]
Since set_current_state() contains a memory barrier in it,
an additional barrier isn't needed.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
13 years agoi2c: I2C_ELEKTOR should depend on HAS_IOPORT
Geert Uytterhoeven [Thu, 18 Aug 2011 01:28:41 +0000 (11:28 +1000)]
i2c: I2C_ELEKTOR should depend on HAS_IOPORT

On m68k, I get:

drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’:
drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’
drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast
drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’:
drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’

Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI
mapping functions conditional"), ioport_map() is only available on platforms
that set HAS_IOPORT.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jean Delvare <khali@linuxfr.org>
13 years agobnx2x: Use pr_fmt and message logging cleanups
Joe Perches [Sun, 14 Aug 2011 12:16:21 +0000 (12:16 +0000)]
bnx2x: Use pr_fmt and message logging cleanups

Add pr_fmt(fmt) KBUILD_MODNAME ": " to prefix messages with "bnx2x: ".
Remove #define DP_LEVEL and use pr_notice.
Repeating KERN_<LEVEL> isn't necessary in multi-line printks.
printk macro neatening, use fmt and ##__VA_ARGS__.
Coalesce long formats.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: Coalesce pr_cont uses and fix DP typos
Joe Perches [Sun, 14 Aug 2011 12:16:20 +0000 (12:16 +0000)]
bnx2x: Coalesce pr_cont uses and fix DP typos

Uses of pr_cont should be avoided where reasonably possible
because they can be interleaved by other threads and processes.

Coalesce pr_cont uses.

Fix typos, duplicated words and spacing in DP uses caused
by split multi-line formats.  Coalesce some of these
split formats.  Add missing terminating newlines to DP uses.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: Remove local defines for %pM and mac address
Joe Perches [Sun, 14 Aug 2011 12:16:19 +0000 (12:16 +0000)]
bnx2x: Remove local defines for %pM and mac address

Use %pM and mac address directly instead.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoMerge branches 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v' and 'pgt' into for...
Russell King [Wed, 17 Aug 2011 21:26:56 +0000 (22:26 +0100)]
Merge branches 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v' and 'pgt' into for-next

13 years agobefs: Validate length of long symbolic links.
Timo Warns [Wed, 17 Aug 2011 15:59:56 +0000 (17:59 +0200)]
befs: Validate length of long symbolic links.

Signed-off-by: Timo Warns <warns@pre-sense.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Linus Torvalds [Wed, 17 Aug 2011 20:15:25 +0000 (13:15 -0700)]
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Domains: Fix build for CONFIG_PM_RUNTIME unset

13 years agomm: fix __page_to_pfn for a const struct page argument
Ian Campbell [Wed, 17 Aug 2011 16:40:33 +0000 (17:40 +0100)]
mm: fix __page_to_pfn for a const struct page argument

This allows the cast in lowmem_page_address (introduced as a warning
fixup to 33dd4e0ec911 "mm: make some struct page's const") to be
removed.

Propagate const'ness to page_to_section() as well since it is required
by __page_to_pfn.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agomm: make HASHED_PAGE_VIRTUAL page_address' struct page argument const.
Ian Campbell [Wed, 17 Aug 2011 12:45:09 +0000 (13:45 +0100)]
mm: make HASHED_PAGE_VIRTUAL page_address' struct page argument const.

Followup to 33dd4e0ec911 "mm: make some struct page's const" which missed the
HASHED_PAGE_VIRTUAL case.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branches 'ipoib' and 'iser' into for-next
Roland Dreier [Wed, 17 Aug 2011 17:57:43 +0000 (10:57 -0700)]
Merge branches 'ipoib' and 'iser' into for-next

13 years agoMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 17 Aug 2011 17:31:39 +0000 (10:31 -0700)]
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf probe: Filter out redundant inline-instances
  perf probe: Search concrete out-of-line instances
  perf probe: Avoid searching variables in intermediate scopes
  perf probe: Fix to search local variables in appropriate scope
  perf probe: Warn when more than one line are given
  perf probe: Fix to walk all inline instances
  perf probe: Fix to search nested inlined functions in CU
  perf probe: Fix line walker to check CU correctly
  perf probe: Fix a memory leak for scopes array
  perf: fix temporary file ownership check
  perf report: Use properly build_id kernel binaries
  perf top browser: Remove spurious helpline update

13 years agoMerge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 17 Aug 2011 17:28:33 +0000 (10:28 -0700)]
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rtc: Limit RTC PIE frequency
  rtc: Fix hrtimer deadlock
  rtc: Handle errors correctly in rtc_irq_set_state()

Fixup trivial conflicts in drivers/rtc/interface.c due to slightly
trivially versions of the same patch coming in two different ways.

13 years agoMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 17 Aug 2011 17:25:08 +0000 (10:25 -0700)]
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Fix wrong assumption in match_held_lock

13 years agoMerge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 17 Aug 2011 17:23:50 +0000 (10:23 -0700)]
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  irq: Track the owner of irq descriptor
  irq: Always set IRQF_ONESHOT if no primary handler is specified
  genirq: Fix wrong bit operation

13 years agoIB/iser: Support iSCSI PDU padding
Or Gerlitz [Mon, 1 Aug 2011 21:14:09 +0000 (21:14 +0000)]
IB/iser: Support iSCSI PDU padding

RFC3270 mandates that iSCSI PDUs are padded to the closest integer
number of four byte words.  Fix the iser code to support that on both
the TX/RX flows.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>
13 years agoIBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long)
Or Gerlitz [Mon, 1 Aug 2011 21:12:09 +0000 (21:12 +0000)]
IBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long)

The code that prepares the SG associated with SCSI command for FMR was
buggy for systems with DMA addresses that don't fit in unsigned long,
e.g under the 32-bit based XenServer dom0 sizeof(dma_addr_t) is 8.

Fix that by casting to unsigned long long a masking constant used by
the code. This resolves a crash in iser_sg_to_page_vec on this system.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>
13 years agofat: fat16 support maximum 4GB file/vol size as WinXP or 7.
Namjae Jeon [Wed, 17 Aug 2011 10:10:09 +0000 (19:10 +0900)]
fat: fat16 support maximum 4GB file/vol size as WinXP or 7.

FAT16 support maximum 4GB vol/file size with 64KB cluster size.

Win NT/XP/7 increased the maximum cluster size to 64KB, and file/vol
size increased 4GB also.  Although increasing, the file size of linux
FAT is still limited at 2GB.

I found that it is limited by sb->maxbytes(0x7fffffff) when partition
is formatted by FAT16.  sb->s_maxbytes in fill_super should be set to
0xffffffff like fat32.

Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
13 years agofat: fix utf8 iocharset warning message
Mihai Moldovan [Wed, 17 Aug 2011 10:10:08 +0000 (19:10 +0900)]
fat: fix utf8 iocharset warning message

The fat_msg function already formats the given message and appends
a newline to it - we don't need to do this in the passed message
string as well, or will end up with a blank line printed in the
kernel log ring buffer.

Also change the loglevel from error to warning.

Signed-off-by: Mihai Moldovan <ionic@ionic.de>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
13 years agofat: fix build warning
Jonas Aberg [Wed, 17 Aug 2011 10:10:06 +0000 (19:10 +0900)]
fat: fix build warning

This fixes a compile warning (unititialized variable) in
the fat filesystem code.

Signed-off-by: Jonas Aberg <jonas.aberg@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
13 years agoARM: io: remove IO_SPACE_LIMIT from SA11x0
Russell King [Wed, 6 Jul 2011 15:57:41 +0000 (16:57 +0100)]
ARM: io: remove IO_SPACE_LIMIT from SA11x0

SA11x0 only uses IO_SPACE_LIMIT for SOC_COMMON, so we can use the
default value in asm/io.h.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: remove IO_SPACE_LIMIT from platforms without PCI/ISA
Russell King [Wed, 6 Jul 2011 11:55:41 +0000 (12:55 +0100)]
ARM: io: remove IO_SPACE_LIMIT from platforms without PCI/ISA

Nothing should be using PCI/ISA IO on these platforms, so their
IO_SPACE_LIMIT definitions are irrelevent.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: remove IO_SPACE_LIMIT from platforms with ISA/PCI and 64K window
Russell King [Thu, 7 Jul 2011 08:02:06 +0000 (09:02 +0100)]
ARM: io: remove IO_SPACE_LIMIT from platforms with ISA/PCI and 64K window

Remove IO_SPACE_LIMIT definitions from platforms which have a well
defined ISA or PCI, and has a 64K window.

EBSA110 - well defined set of ISA devices.
Footbridge, Integrator, IXP4xx, VT8500 - PCI platforms.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: add a default IO_SPACE_LIMIT definition
Russell King [Wed, 6 Jul 2011 11:49:59 +0000 (12:49 +0100)]
ARM: io: add a default IO_SPACE_LIMIT definition

Add a default IO_SPACE_LIMIT definition.  Explain the chosen value and
suggest why platforms would want to make it larger.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: RiscPC: eliminate private inb() et.al. definitions
Russell King [Thu, 7 Jul 2011 13:43:11 +0000 (14:43 +0100)]
ARM: io: RiscPC: eliminate private inb() et.al. definitions

As we've got rid of the bit-31 set IO addresses, we can now use the
standard inb() definitions and reduce the IO space limit to 64K.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: RiscPC: make EASI_BASE a void iomem pointer
Russell King [Thu, 7 Jul 2011 10:40:52 +0000 (11:40 +0100)]
ARM: io: RiscPC: make EASI_BASE a void iomem pointer

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: ecard: remove ioaddr() from ecard.c
Russell King [Thu, 7 Jul 2011 10:07:36 +0000 (11:07 +0100)]
ARM: io: ecard: remove ioaddr() from ecard.c

Remove ioaddr() usage from ecard.c, updating (and renaming) the
constants in RiscPC's hardware.h to contain the proper translation.
As this gets rid of the last ioaddr() usage, kill that too.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: ecard: move ioaddr() inside __ecard_address
Russell King [Thu, 7 Jul 2011 09:56:41 +0000 (10:56 +0100)]
ARM: io: ecard: move ioaddr() inside __ecard_address

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: RiscPC: define io addresses relative to IO_BASE
Russell King [Thu, 7 Jul 2011 10:31:36 +0000 (11:31 +0100)]
ARM: io: RiscPC: define io addresses relative to IO_BASE

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoARM: io: s3c2410: remove ioaddr()
Russell King [Wed, 6 Jul 2011 12:05:15 +0000 (13:05 +0100)]
ARM: io: s3c2410: remove ioaddr()

There is only one user of ioaddr() in the kernel, and that is the Acorn
expansion card core code.  S3C2410 does not use this code, and so the
definition of ioaddr() is redundant.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
13 years agoMerge branch 'for-3.1' into for-3.2
Mark Brown [Wed, 17 Aug 2011 07:34:05 +0000 (16:34 +0900)]
Merge branch 'for-3.1' into for-3.2