]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 27 Sep 2012 04:05:08 +0000 (14:05 +1000)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 27 Sep 2012 04:00:39 +0000 (14:00 +1000)]
Merge remote-tracking branch 'security/next'

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:58:59 +0000 (13:58 +1000)]
Merge remote-tracking branch 'regulator/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt

11 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:57:15 +0000 (13:57 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

11 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:55:37 +0000 (13:55 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'

11 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 27 Sep 2012 03:53:54 +0000 (13:53 +1000)]
Merge remote-tracking branch 'battery/master'

Conflicts:
include/linux/mfd/88pm860x.h

11 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:46:43 +0000 (13:46 +1000)]
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/mfd/tps65217.c
drivers/regulator/anatop-regulator.c

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:44:56 +0000 (13:44 +1000)]
Merge remote-tracking branch 'md/for-next'

Conflicts:
drivers/md/raid0.c
fs/bio.c

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:38:00 +0000 (13:38 +1000)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:36:19 +0000 (13:36 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 27 Sep 2012 03:34:45 +0000 (13:34 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge commit 'refs/next/20120926/device-mapper'
Stephen Rothwell [Thu, 27 Sep 2012 03:26:28 +0000 (13:26 +1000)]
Merge commit 'refs/next/20120926/device-mapper'

11 years agoMerge commit 'refs/next/20120926/block'
Stephen Rothwell [Thu, 27 Sep 2012 03:15:39 +0000 (13:15 +1000)]
Merge commit 'refs/next/20120926/block'

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:59:41 +0000 (12:59 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 27 Sep 2012 02:57:56 +0000 (12:57 +1000)]
Merge remote-tracking branch 'input/next'

11 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Thu, 27 Sep 2012 02:52:41 +0000 (12:52 +1000)]
Merge branch 'quilt/rr'

Conflicts:
arch/xtensa/Kconfig

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:50:58 +0000 (12:50 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:46:03 +0000 (12:46 +1000)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c

11 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:44:09 +0000 (12:44 +1000)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_sdvo.c

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:42:23 +0000 (12:42 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/Kconfig

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:40:40 +0000 (12:40 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:38:58 +0000 (12:38 +1000)]
Merge remote-tracking branch 'mtd/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:36:52 +0000 (12:36 +1000)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/ath/ath9k/pci.c

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:29:29 +0000 (12:29 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/socket.c

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 27 Sep 2012 02:27:44 +0000 (12:27 +1000)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:25:56 +0000 (12:25 +1000)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:22:27 +0000 (12:22 +1000)]
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c

11 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 27 Sep 2012 02:20:48 +0000 (12:20 +1000)]
Merge remote-tracking branch 'dlm/next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:19:09 +0000 (12:19 +1000)]
Merge remote-tracking branch 'ubi/linux-next'

11 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:17:35 +0000 (12:17 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 27 Sep 2012 02:15:58 +0000 (12:15 +1000)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:15:51 +0000 (12:15 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

11 years agoMerge remote-tracking branch 'acpi/next'
Stephen Rothwell [Thu, 27 Sep 2012 02:13:53 +0000 (12:13 +1000)]
Merge remote-tracking branch 'acpi/next'

11 years agoMerge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:12:15 +0000 (12:12 +1000)]
Merge remote-tracking branch 'pstore/master'

11 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:10:22 +0000 (12:10 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

11 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 27 Sep 2012 02:08:40 +0000 (12:08 +1000)]
Merge remote-tracking branch 'libata/NEXT'

11 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:07:05 +0000 (12:07 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:05:22 +0000 (12:05 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 27 Sep 2012 02:03:17 +0000 (12:03 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 27 Sep 2012 02:01:43 +0000 (12:01 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 27 Sep 2012 02:00:15 +0000 (12:00 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

11 years agoMerge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:58:49 +0000 (11:58 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

11 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 27 Sep 2012 01:57:18 +0000 (11:57 +1000)]
Merge branch 'quilt/i2c'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:55:31 +0000 (11:55 +1000)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Thu, 27 Sep 2012 01:54:03 +0000 (11:54 +1000)]
Merge remote-tracking branch 'galak/next'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 27 Sep 2012 01:52:37 +0000 (11:52 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 27 Sep 2012 01:50:02 +0000 (11:50 +1000)]
Merge remote-tracking branch 'powerpc/next'

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 27 Sep 2012 01:46:40 +0000 (11:46 +1000)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:40:14 +0000 (11:40 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/stat.c
kernel/events/core.c

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:38:34 +0000 (11:38 +1000)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:37:09 +0000 (11:37 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:35:39 +0000 (11:35 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:34:03 +0000 (11:34 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:32:28 +0000 (11:32 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:30:50 +0000 (11:30 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 27 Sep 2012 01:29:22 +0000 (11:29 +1000)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:27:56 +0000 (11:27 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 27 Sep 2012 01:26:31 +0000 (11:26 +1000)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:24:56 +0000 (11:24 +1000)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 27 Sep 2012 01:23:23 +0000 (11:23 +1000)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 27 Sep 2012 01:21:53 +0000 (11:21 +1000)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:20:20 +0000 (11:20 +1000)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 27 Sep 2012 01:18:55 +0000 (11:18 +1000)]
Merge remote-tracking branch 'xtensa/for_next'

11 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 27 Sep 2012 01:17:25 +0000 (11:17 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

11 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Thu, 27 Sep 2012 01:15:59 +0000 (11:15 +1000)]
Merge remote-tracking branch 'sparc-next/master'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 27 Sep 2012 01:10:54 +0000 (11:10 +1000)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 27 Sep 2012 01:09:15 +0000 (11:09 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:07:47 +0000 (11:07 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:06:20 +0000 (11:06 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

11 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:04:50 +0000 (11:04 +1000)]
Merge remote-tracking branch 'm68k/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 27 Sep 2012 01:03:22 +0000 (11:03 +1000)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:01:55 +0000 (11:01 +1000)]
Merge remote-tracking branch 'cris/for-next'

11 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 27 Sep 2012 01:00:32 +0000 (11:00 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 27 Sep 2012 00:55:25 +0000 (10:55 +1000)]
Merge remote-tracking branch 'arm64/upstream'

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 27 Sep 2012 00:53:56 +0000 (10:53 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

Conflicts:
arch/arm/kernel/hw_breakpoint.c

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 27 Sep 2012 00:52:28 +0000 (10:52 +1000)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 27 Sep 2012 00:45:38 +0000 (10:45 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'

11 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 27 Sep 2012 00:45:34 +0000 (10:45 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

11 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Thu, 27 Sep 2012 00:45:13 +0000 (10:45 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'

11 years agoMerge branch 'devel-stable' into for-next
Russell King [Wed, 26 Sep 2012 22:37:01 +0000 (23:37 +0100)]
Merge branch 'devel-stable' into for-next

11 years agoMerge branch 'arch-timers' into for-next
Russell King [Wed, 26 Sep 2012 22:36:42 +0000 (23:36 +0100)]
Merge branch 'arch-timers' into for-next

Conflicts:
arch/arm/include/asm/timex.h
arch/arm/lib/delay.c

11 years agoMerge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcod...
Russell King [Wed, 26 Sep 2012 22:36:25 +0000 (23:36 +0100)]
Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcodes' and 'syscall' into for-next

11 years agoMerge branch 'cleanup' into for-next
Russell King [Wed, 26 Sep 2012 22:36:22 +0000 (23:36 +0100)]
Merge branch 'cleanup' into for-next

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c

11 years agoARM: 7540/1: kexec: Check segment memory addresses
Matthew Leach [Fri, 21 Sep 2012 17:56:11 +0000 (18:56 +0100)]
ARM: 7540/1: kexec: Check segment memory addresses

Ensure that the memory regions that are set within the segments
correspond to physical contiguous memory regions.

Reviewed-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 7539/1: kexec: scan for dtb magic in segments
Matthew Leach [Fri, 21 Sep 2012 17:56:02 +0000 (18:56 +0100)]
ARM: 7539/1: kexec: scan for dtb magic in segments

This patch allows a dtb to be passed to a new kernel using the kexec
mechinism.

When loading segments from userspace, scan each segment's first four
bytes for the dtb magic. If this is found set the kexec_boot_atags
parameter to the relocate_kernel code to the phyical address of this
segment.

Reviewed-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoARM: 7538/1: delay: add registration mechanism for delay timer sources
Jonathan Austin [Fri, 21 Sep 2012 17:51:44 +0000 (18:51 +0100)]
ARM: 7538/1: delay: add registration mechanism for delay timer sources

The current timer-based delay loop relies on the architected timer to
initiate the switch away from the polling-based implementation. This is
unfortunate for platforms without the architected timers but with a
suitable delay source (that is, constant frequency, always powered-up
and ticking as long as the CPUs are online).

This patch introduces a registration mechanism for the delay timer
(which provides an unconditional read_current_timer implementation) and
updates the architected timer code to use the new interface.

Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 years agoMerge branch 'turbostat' into next
Len Brown [Wed, 26 Sep 2012 21:43:18 +0000 (17:43 -0400)]
Merge branch 'turbostat' into next

11 years agoMerge branch 'cache-louis' of git://linux-arm.org/linux-2.6-lp into devel-stable
Russell King [Wed, 26 Sep 2012 21:42:18 +0000 (22:42 +0100)]
Merge branch 'cache-louis' of git://linux-arm.org/linux-2.6-lp into devel-stable

11 years agotools/power turbostat: run on IVB Xeon
Len Brown [Wed, 26 Sep 2012 21:40:27 +0000 (17:40 -0400)]
tools/power turbostat: run on IVB Xeon

This fix is required to run on IVB Xeon,
which previously had an incorrect cpuid model number listed.

Signed-off-by: Len Brown <len.brown@intel.com>
11 years agoxfs: Make inode32 a remountable option
Carlos Maiolino [Thu, 20 Sep 2012 13:32:41 +0000 (10:32 -0300)]
xfs: Make inode32 a remountable option

As inode64 is the default option now, and was also made remountable
previously, inode32 can also be remounted on-the-fly when it is needed.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoxfs: add inode64->inode32 transition into xfs_set_inode32()
Carlos Maiolino [Thu, 20 Sep 2012 13:32:40 +0000 (10:32 -0300)]
xfs: add inode64->inode32 transition into xfs_set_inode32()

To make inode32 a remountable option, xfs_set_inode32() should be able
to make a transition from inode64 option, disabling inode allocation on
higher AGs.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoxfs: Fix mp->m_maxagi update during inode64 remount
Carlos Maiolino [Thu, 20 Sep 2012 13:32:39 +0000 (10:32 -0300)]
xfs: Fix mp->m_maxagi update during inode64 remount

With the changes made on xfs_set_inode64(), to make it behave as
xfs_set_inode32() (now leaving to the caller the responsibility to update
mp->m_maxagi), we use the return value of xfs_set_inode64() to update
mp->m_maxagi during remount.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoxfs: reduce code duplication handling inode32/64 options
Carlos Maiolino [Thu, 20 Sep 2012 13:32:38 +0000 (10:32 -0300)]
xfs: reduce code duplication handling inode32/64 options

Add xfs_set_inode32() to be used to enable inode32 allocation mode. this
will reduce the amount of duplicated code needed to mount/remount a
filesystem with inode32 option.  This patch also changes
xfs_set_inode64() to return the maximum AG number that inodes can be
allocated instead of set mp->m_maxagi by itself, so that the behaviour
is the same as xfs_set_inode32().  This simplifies code that calls these
functions and needs to know the maximum AG that inodes can be allocated
in.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoxfs: make inode64 as the default allocation mode
Carlos Maiolino [Thu, 20 Sep 2012 13:32:37 +0000 (10:32 -0300)]
xfs: make inode64 as the default allocation mode

since 64-bit inodes can be accessed while using inode32, and these can
also be used on 32-bit kernels, there is no reason to still keep inode32
as the default mount option.  If the filesystem cannot handle 64bit
inode numbers (i.e CONFIG_LBDAF is not enabled and BITS_PER_LONG == 32),
XFS_MOUNT_SMALL_INUMS will still be set by default, so inode64 is not an
unconditional default value.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoxfs: Fix m_agirotor reset during AG selection
Carlos Maiolino [Thu, 20 Sep 2012 13:32:36 +0000 (10:32 -0300)]
xfs: Fix m_agirotor reset during AG selection

xfs_ialloc_next_ag() currently resets m_agirotor when it is equal to
m_maxagi:

         if (++mp->m_agirotor == mp->m_maxagi)
         mp->m_agirotor = 0;

But, if for some reason mp->m_maxagi changes to a lower value than
current m_agirotor, this condition will never be true, causing
m_agirotor to exceed the maximum allowed value (m_maxagi).

This implies mainly during lookups for xfs_perag structs in its radix
tree, since the agno value used for the lookup is based on m_agirotor.
An out-of-range m_agirotor may cause a lookup failure which in case will
return NULL.

As an example, the value of m_maxagi is decreased during
inode64->inode32 remount process, case where I've found this problem.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoMake inode64 a remountable option
Carlos Maiolino [Fri, 17 Aug 2012 21:19:38 +0000 (18:19 -0300)]
Make inode64 a remountable option

Actually, there is no reason about why a user must umount and mount a
XFS filesystem to enable 'inode64' option. So, this patch makes this a
remountable option.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
11 years agoMerge branch 'next/p3/trace' into mips-for-linux-next
Ralf Baechle [Wed, 26 Sep 2012 20:02:49 +0000 (22:02 +0200)]
Merge branch 'next/p3/trace' into mips-for-linux-next

11 years agoMerge branch 'next/p1/for-linus' into mips-for-linux-next
Ralf Baechle [Wed, 26 Sep 2012 20:02:35 +0000 (22:02 +0200)]
Merge branch 'next/p1/for-linus' into mips-for-linux-next

11 years agoMIPS: Replace `-' in defconfig filename wth `_' for consistency.
Ralf Baechle [Wed, 26 Sep 2012 20:00:05 +0000 (22:00 +0200)]
MIPS: Replace `-' in defconfig filename wth `_' for consistency.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
11 years agoMIPS: NOTIFY_RESUME is not needed in TIF masks
Al Viro [Sat, 5 May 2012 20:24:40 +0000 (16:24 -0400)]
MIPS: NOTIFY_RESUME is not needed in TIF masks

If it's set, SIGPENDING is also set.  And SIGPENDING is present in
the masks...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>