]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 24 Aug 2012 04:42:43 +0000 (14:42 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
Stephen Rothwell [Fri, 24 Aug 2012 04:41:06 +0000 (14:41 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:39:07 +0000 (14:39 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:39:00 +0000 (14:39 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Fri, 24 Aug 2012 04:38:46 +0000 (14:38 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 24 Aug 2012 04:37:11 +0000 (14:37 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Fri, 24 Aug 2012 04:29:59 +0000 (14:29 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:23:48 +0000 (14:23 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:22:12 +0000 (14:22 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:20:33 +0000 (14:20 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 24 Aug 2012 04:18:54 +0000 (14:18 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 24 Aug 2012 04:18:48 +0000 (14:18 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 24 Aug 2012 04:16:43 +0000 (14:16 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 24 Aug 2012 04:15:05 +0000 (14:15 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:13:23 +0000 (14:13 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:11:46 +0000 (14:11 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 24 Aug 2012 04:10:13 +0000 (14:10 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:08:34 +0000 (14:08 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:06:57 +0000 (14:06 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:05:22 +0000 (14:05 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:03:49 +0000 (14:03 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:02:06 +0000 (14:02 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 24 Aug 2012 03:59:41 +0000 (13:59 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:59:39 +0000 (13:59 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:58:00 +0000 (13:58 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 24 Aug 2012 03:52:35 +0000 (13:52 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Fri, 24 Aug 2012 03:50:54 +0000 (13:50 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:49:14 +0000 (13:49 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:46:18 +0000 (13:46 +1000)]
Merge commit 'refs/next/
20120823 /drm'
Stephen Rothwell [Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:54:43 +0000 (11:54 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:53:05 +0000 (11:53 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:51:31 +0000 (11:51 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:49:37 +0000 (11:49 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:42:30 +0000 (11:42 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:40:54 +0000 (11:40 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 24 Aug 2012 01:39:13 +0000 (11:39 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:37:31 +0000 (11:37 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/ata/libata-core.c
Stephen Rothwell [Fri, 24 Aug 2012 01:35:53 +0000 (11:35 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 24 Aug 2012 01:34:09 +0000 (11:34 +1000)]
Merge commit 'refs/next/
20120823 /ubi'
Stephen Rothwell [Fri, 24 Aug 2012 01:09:58 +0000 (11:09 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 24 Aug 2012 01:09:51 +0000 (11:09 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
Stephen Rothwell [Fri, 24 Aug 2012 01:08:14 +0000 (11:08 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:06:38 +0000 (11:06 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 24 Aug 2012 01:05:03 +0000 (11:05 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:04:52 +0000 (11:04 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:02:53 +0000 (11:02 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:01:24 +0000 (11:01 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:00:00 +0000 (11:00 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 24 Aug 2012 00:58:34 +0000 (10:58 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:57:09 +0000 (10:57 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:51:20 +0000 (10:51 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:49:47 +0000 (10:49 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:48:20 +0000 (10:48 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:46:45 +0000 (10:46 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:45:18 +0000 (10:45 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:43:45 +0000 (10:43 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:42:18 +0000 (10:42 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:40:47 +0000 (10:40 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 24 Aug 2012 00:39:19 +0000 (10:39 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 24 Aug 2012 00:37:52 +0000 (10:37 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:36:29 +0000 (10:36 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 24 Aug 2012 00:35:05 +0000 (10:35 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 24 Aug 2012 00:33:41 +0000 (10:33 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:32:16 +0000 (10:32 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 24 Aug 2012 00:30:49 +0000 (10:30 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 24 Aug 2012 00:28:20 +0000 (10:28 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 24 Aug 2012 00:26:53 +0000 (10:26 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 24 Aug 2012 00:25:25 +0000 (10:25 +1000)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:23:58 +0000 (10:23 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:22:35 +0000 (10:22 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:21:10 +0000 (10:21 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:19:41 +0000 (10:19 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:18:11 +0000 (10:18 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Fri, 24 Aug 2012 00:16:41 +0000 (10:16 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:52 +0000 (10:09 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:48 +0000 (10:09 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:41 +0000 (10:09 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:41 +0000 (10:09 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:37 +0000 (10:09 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:35 +0000 (10:09 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:34 +0000 (10:09 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:34 +0000 (10:09 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:33 +0000 (10:09 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:09:31 +0000 (10:09 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Ralf Baechle [Thu, 23 Aug 2012 21:42:57 +0000 (23:42 +0200)]
Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
Ralf Baechle [Thu, 23 Aug 2012 21:42:40 +0000 (23:42 +0200)]
Merge branch 'next/p3/trace' into mips-for-linux-next
Ralf Baechle [Thu, 23 Aug 2012 21:42:08 +0000 (23:42 +0200)]
Merge branch 'next/p3/lantiq' into mips-for-linux-next
Ralf Baechle [Thu, 23 Aug 2012 21:42:02 +0000 (23:42 +0200)]
Merge branch 'next/p3/cavium' into mips-for-linux-next
Ralf Baechle [Thu, 23 Aug 2012 21:41:51 +0000 (23:41 +0200)]
Merge branch 'next/p3/ath79' into mips-for-linux-next
Ralf Baechle [Thu, 23 Aug 2012 21:41:38 +0000 (23:41 +0200)]
Merge branch 'next/p2/generic' into mips-for-linux-next
Ralf Baechle [Thu, 23 Aug 2012 21:41:14 +0000 (23:41 +0200)]
Merge branch 'next/p1/for-linus' into mips-for-linux-next
RongQing.Li [Mon, 2 Jul 2012 04:34:30 +0000 (12:34 +0800)]
MIPS: CMP/SMTC: Fix tc_id calculation
Currently the tc_id code is:
(read_c0_tcbind() >> TCBIND_CURTC_SHIFT) & TCBIND_CURTC;
After processing this becomes:
(read_c0_tcbind() >> 21) & ((0xff) << 21)
But it should be:
(read_c0_tcbind() & ((0xff)<< 21)) >> 21
Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4077/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
David Daney [Thu, 23 Aug 2012 17:02:03 +0000 (10:02 -0700)]
MIPS: Optimize TLB refill for RI/XI configurations.
We don't have to do a separate shift to eliminate the software bits,
just rotate them into the fill and they will be ignored.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4294/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Frederic Weisbecker [Wed, 22 Aug 2012 16:23:44 +0000 (18:23 +0200)]
m68k: Add missing RCU idle APIs on idle loop
In the old times, the whole idle task was considered
as an RCU quiescent state. But as RCU became more and
more successful overtime, some RCU read side critical
section have been added even in the code of some
architectures idle tasks, for tracing for example.
So nowadays, rcu_idle_enter() and rcu_idle_exit() must
be called by the architecture to tell RCU about the part
in the idle loop that doesn't make use of rcu read side
critical sections, typically the part that puts the CPU
in low power mode.
This is necessary for RCU to find the quiescent states in
idle in order to complete grace periods.
Add this missing pair of calls in the m68k's idle loop.
Reported-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: m68k <linux-m68k@lists.linux-m68k.org>
Cc: 3.2.x.. <stable@vger.kernel.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Prabhakar Kushwaha [Thu, 16 Aug 2012 03:58:22 +0000 (09:28 +0530)]
powerpc/mpc85xx: Add new ext fields to Integrated FLash Controller
Freescale's Integrated Flash controller(IFC) v1.1.0 supports 40 bit
address bus width.
In case more than 32 bit address is used, the EXT registers should be set.
Add support of ext registers.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Prabhakar Kushwaha [Wed, 15 Aug 2012 15:13:52 +0000 (20:43 +0530)]
powerpc: Update Integrated Flash controller device tree bindings
Freescale's Integrated Flash controller (IFC) may have one or two
interrupts. In case of single interrupt line, it will cover all IFC
interrupts.
Update this information in IFC device tree bindings
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Olivia Yin [Thu, 9 Aug 2012 07:42:36 +0000 (15:42 +0800)]
powerpc/e5500: Add Power ISA properties to comply with ePAPR 1.1
power-isa-version and power-isa-* are cpu node general properties defined
in ePAPR.
If the power-isa-version property exists, then for each category from the
Categories section of Book I of the Power ISA version indicated, the
existence of a property named power-isa-[CAT], where [CAT] is the
abbreviated category name with all uppercase letters converted to
lowercase, indicates that the category is supported by the implementation.
This patch update all the e5500 platforms.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Olivia Yin <hong-hua.yin@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Olivia Yin [Thu, 9 Aug 2012 07:42:35 +0000 (15:42 +0800)]
powerpc/e500mc: Add Power ISA properties to comply with ePAPR 1.1
power-isa-version and power-isa-* are cpu node general properties defined
in ePAPR.
If the power-isa-version property exists, then for each category from the
Categories section of Book I of the Power ISA version indicated, the
existence of a property named power-isa-[CAT], where [CAT] is the
abbreviated category name with all uppercase letters converted to
lowercase, indicates that the category is supported by the implementation.
The patch update all the e500mc platforms.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Olivia Yin <hong-hua.yin@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>