]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 20 Aug 2012 06:15:18 +0000 (16:15 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

12 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 06:13:25 +0000 (16:13 +1000)]
Merge remote-tracking branch 'leds/for-next'

12 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 06:11:50 +0000 (16:11 +1000)]
Merge remote-tracking branch 'regmap/for-next'

12 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:51:09 +0000 (14:51 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

12 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:49:25 +0000 (14:49 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'

12 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:47:42 +0000 (14:47 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

12 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:46:05 +0000 (14:46 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/s390/include/asm/processor.h

12 years agoMerge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Mon, 20 Aug 2012 04:44:23 +0000 (14:44 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'

12 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 20 Aug 2012 04:37:12 +0000 (14:37 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
include/linux/sched.h

12 years agoMerge commit 'refs/next/20120814/tip'
Stephen Rothwell [Mon, 20 Aug 2012 04:08:31 +0000 (14:08 +1000)]
Merge commit 'refs/next/20120814/tip'

12 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:04:48 +0000 (14:04 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'

12 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:02:48 +0000 (14:02 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:02:41 +0000 (14:02 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c

12 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 20 Aug 2012 04:02:27 +0000 (14:02 +1000)]
Merge remote-tracking branch 'edac/linux_next'

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 04:00:42 +0000 (14:00 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'

12 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:53:44 +0000 (13:53 +1000)]
Merge remote-tracking branch 'pm/linux-next'

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:47:32 +0000 (13:47 +1000)]
Merge remote-tracking branch 'trivial/for-next'

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:45:54 +0000 (13:45 +1000)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 20 Aug 2012 03:44:18 +0000 (13:44 +1000)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:42:38 +0000 (13:42 +1000)]
Merge remote-tracking branch 'watchdog/master'

12 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:42:32 +0000 (13:42 +1000)]
Merge remote-tracking branch 'selinux/master'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 20 Aug 2012 03:40:30 +0000 (13:40 +1000)]
Merge remote-tracking branch 'security/next'

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:38:54 +0000 (13:38 +1000)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:37:05 +0000 (13:37 +1000)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:35:30 +0000 (13:35 +1000)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:33:52 +0000 (13:33 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:32:20 +0000 (13:32 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

12 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 20 Aug 2012 03:30:39 +0000 (13:30 +1000)]
Merge branch 'quilt/device-mapper'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:28:15 +0000 (13:28 +1000)]
Merge remote-tracking branch 'block/for-next'

12 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:28:12 +0000 (13:28 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 20 Aug 2012 03:26:30 +0000 (13:26 +1000)]
Merge remote-tracking branch 'input/next'

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Mon, 20 Aug 2012 03:21:23 +0000 (13:21 +1000)]
Merge branch 'quilt/rr'

Conflicts:
arch/s390/Kconfig
arch/xtensa/Kconfig

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:19:44 +0000 (13:19 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:17:58 +0000 (13:17 +1000)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:17:56 +0000 (13:17 +1000)]
Merge remote-tracking branch 'drm/drm-next'

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:16:20 +0000 (13:16 +1000)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:14:47 +0000 (13:14 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

12 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:13:09 +0000 (13:13 +1000)]
Merge remote-tracking branch 'mtd/master'

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:11:34 +0000 (13:11 +1000)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 20 Aug 2012 03:04:26 +0000 (13:04 +1000)]
Merge remote-tracking branch 'net-next/master'

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 20 Aug 2012 03:02:49 +0000 (13:02 +1000)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 03:01:07 +0000 (13:01 +1000)]
Merge remote-tracking branch 'target-updates/for-next'

12 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:59:24 +0000 (12:59 +1000)]
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
drivers/ata/libata-core.c

12 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 20 Aug 2012 02:57:49 +0000 (12:57 +1000)]
Merge remote-tracking branch 'dlm/next'

12 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:56:17 +0000 (12:56 +1000)]
Merge remote-tracking branch 'ubi/linux-next'

12 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 20 Aug 2012 02:54:43 +0000 (12:54 +1000)]
Merge remote-tracking branch 'thermal/next'

12 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:54:36 +0000 (12:54 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 20 Aug 2012 02:44:34 +0000 (12:44 +1000)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:42:56 +0000 (12:42 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:42:45 +0000 (12:42 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 20 Aug 2012 02:40:53 +0000 (12:40 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:39:28 +0000 (12:39 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 20 Aug 2012 02:38:02 +0000 (12:38 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Mon, 20 Aug 2012 02:36:36 +0000 (12:36 +1000)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:35:08 +0000 (12:35 +1000)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:28:09 +0000 (12:28 +1000)]
Merge remote-tracking branch 'vfs/for-next'

12 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:26:37 +0000 (12:26 +1000)]
Merge remote-tracking branch 'xfs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:25:00 +0000 (12:25 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:23:30 +0000 (12:23 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 20 Aug 2012 02:22:00 +0000 (12:22 +1000)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 20 Aug 2012 02:20:36 +0000 (12:20 +1000)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 20 Aug 2012 02:19:07 +0000 (12:19 +1000)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 20 Aug 2012 02:17:38 +0000 (12:17 +1000)]
Merge remote-tracking branch 'ext3/for_next'

12 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:16:09 +0000 (12:16 +1000)]
Merge remote-tracking branch 'cifs/for-next'

12 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 20 Aug 2012 02:14:44 +0000 (12:14 +1000)]
Merge remote-tracking branch 'xtensa/for_next'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 20 Aug 2012 02:13:18 +0000 (12:13 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 20 Aug 2012 02:11:53 +0000 (12:11 +1000)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Mon, 20 Aug 2012 02:09:27 +0000 (12:09 +1000)]
Merge remote-tracking branch 'galak/next'

12 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Mon, 20 Aug 2012 02:08:01 +0000 (12:08 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:06:36 +0000 (12:06 +1000)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:05:13 +0000 (12:05 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:03:48 +0000 (12:03 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:02:23 +0000 (12:02 +1000)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 02:00:57 +0000 (12:00 +1000)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Mon, 20 Aug 2012 01:59:27 +0000 (11:59 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 20 Aug 2012 01:58:02 +0000 (11:58 +1000)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:30 +0000 (11:54 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'

12 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:29 +0000 (11:54 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

12 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:21 +0000 (11:54 +1000)]
Merge remote-tracking branch 'crypto-current/master'

12 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:17 +0000 (11:54 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'

12 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:16 +0000 (11:54 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:15 +0000 (11:54 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:13 +0000 (11:54 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

12 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Mon, 20 Aug 2012 01:54:12 +0000 (11:54 +1000)]
Merge remote-tracking branch 'net/master'

12 years agoOverflow checking in dm-verity was not sufficient.
Mikulas Patocka [Mon, 20 Aug 2012 01:42:22 +0000 (11:42 +1000)]
Overflow checking in dm-verity was not sufficient.
It would check overflow if sector_t was smaller than long long but not
if sector_t and long long have the same size. This patch implements
proper overflow checking.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
12 years agoext4: remove duplicated declarations in inode.c
Zheng Liu [Sun, 19 Aug 2012 22:07:40 +0000 (18:07 -0400)]
ext4: remove duplicated declarations in inode.c

In patch cb20d5188366f04d96d2e07b1240cc92170ade40, ext4_set_bh_endio
and ext4_end_io_buffer_write are declared at the beginning of inode.c,
and again later on in the middle of the file.  Remove the second set
of duplicated function declarations.

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
12 years agomtd: s3c2410: Fix line over 80 characters warning
Sachin Kamat [Mon, 16 Jul 2012 10:32:27 +0000 (16:02 +0530)]
mtd: s3c2410: Fix line over 80 characters warning

Fixes the following checkpatch warnings:
WARNING: line over 80 characters

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
12 years agomtd: s3c2410: Fix checkpatch warnings and errors related to whitespaces
Sachin Kamat [Mon, 16 Jul 2012 10:32:26 +0000 (16:02 +0530)]
mtd: s3c2410: Fix checkpatch warnings and errors related to whitespaces

Fixes checkpatch warnings and errors related to whitespaces.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
12 years agomtd: s3c2410: Do not initialise statics to 0 or NULL
Sachin Kamat [Mon, 16 Jul 2012 10:32:25 +0000 (16:02 +0530)]
mtd: s3c2410: Do not initialise statics to 0 or NULL

Fixes the following checkpatch errors:
ERROR: do not initialise statics to 0 or NULL
+static int hardware_ecc = 0;

ERROR: do not initialise statics to 0 or NULL
+static const int clock_stop = 0;

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
12 years agomtd: s3c2410: Use <linux/io.h> instead of <asm/io.h>
Sachin Kamat [Mon, 16 Jul 2012 10:32:24 +0000 (16:02 +0530)]
mtd: s3c2410: Use <linux/io.h> instead of <asm/io.h>

Fixes the following checkpatch warning:
WARNING: Use #include <linux/io.h> instead of <asm/io.h>

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
12 years agomtd: s3c2410: Use pr_* instead of printk
Sachin Kamat [Mon, 16 Jul 2012 10:32:23 +0000 (16:02 +0530)]
mtd: s3c2410: Use pr_* instead of printk

Use pr_* instead of printk.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
12 years agomtd: s3c2410: Use module_platform_driver()
Sachin Kamat [Mon, 16 Jul 2012 10:32:22 +0000 (16:02 +0530)]
mtd: s3c2410: Use module_platform_driver()

This makes the code simpler by eliminating module_init() and
module_exit().

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
12 years agodyndbg: fix for SOH in logging messages
Markus Trippelsdorf [Sun, 19 Aug 2012 00:35:51 +0000 (18:35 -0600)]
dyndbg: fix for SOH in logging messages

commit af7f2158fde was done against master, and clashed with structured
logging's change of KERN_LEVEL to SOH.

Bisected and fixed by Markus Trippelsdorf.

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jason Baron <jbaron@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoext4: fix trivial typo in comment
Wang Sheng-Hui [Sun, 19 Aug 2012 02:38:07 +0000 (22:38 -0400)]
ext4: fix trivial typo in comment

Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
12 years agoext4: no need to add inode to orphan list during hole punch
Ashish Sangwan [Sun, 19 Aug 2012 02:29:46 +0000 (22:29 -0400)]
ext4: no need to add inode to orphan list during hole punch

While performing punch hole for an inode, i_disksize is not changed.
So, there is no need to add the inode to orphan list.

Signed-off-by: Ashish Sangwan <ashish.sangwan2@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
Acked-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
12 years agojbd2: don't write superblock when if its empty
Eric Sandeen [Sun, 19 Aug 2012 02:29:40 +0000 (22:29 -0400)]
jbd2: don't write superblock when if its empty

This sequence:

# truncate --size=1g fsfile
# mkfs.ext4 -F fsfile
# mount -o loop,ro fsfile /mnt
# umount /mnt
# dmesg | tail

results in an IO error when unmounting the RO filesystem:

[  318.020828] Buffer I/O error on device loop1, logical block 196608
[  318.027024] lost page write due to I/O error on loop1
[  318.032088] JBD2: Error -5 detected when updating journal superblock for loop1-8.

This was a regression introduced by commit 24bcc89c7e7c: "jbd2: split
updating of journal superblock and marking journal empty".

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
12 years agoext4: replace plain integer with NULL in super.c
Sachin Kamat [Sun, 19 Aug 2012 02:29:18 +0000 (22:29 -0400)]
ext4: replace plain integer with NULL in super.c

Fixes the following sparse warning:
fs/ext4/super.c:1672:45: warning: Using plain integer as NULL pointer

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
12 years agohwmon: (adt7410) handle errors from adt7410_update_device()
Dan Carpenter [Wed, 15 Aug 2012 07:49:43 +0000 (10:49 +0300)]
hwmon: (adt7410) handle errors from adt7410_update_device()

Smatch complains that adt7410_update_device() can return error pointers.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
12 years agohwmon: Driver for ADT7410
Hartmut Knaack [Sun, 12 Aug 2012 16:15:49 +0000 (18:15 +0200)]
hwmon: Driver for ADT7410

This patch brings basic support for the Analog Devices ADT7410 temperature
sensor. The following functionality has been implemented:

  * get current temperature
  * get/set minimum, maximum and critical temperature
  * get/set hysteresis
  * get alarm events for minimum, maximum and critical temperature

All implemented sysfs attributes have been sucessfully tested at temperatures
of 15°C to 40°C.

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
12 years agohwmon: (fam15h_power) Convert to use devm_ functions
Guenter Roeck [Sat, 2 Jun 2012 16:58:06 +0000 (09:58 -0700)]
hwmon: (fam15h_power) Convert to use devm_ functions

Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>