]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agocpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
David Rientjes [Thu, 8 Dec 2011 04:32:04 +0000 (15:32 +1100)]
cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask

c0ff7453bb5c ("cpuset,mm: fix no node to alloc memory when changing
cpuset's mems") adds get_mems_allowed() to prevent the set of allowed
nodes from changing for a thread.  This causes any update to a set of
allowed nodes to stall until put_mems_allowed() is called.

This stall is unncessary, however, if at least one node remains unchanged
in the update to the set of allowed nodes.  This was addressed by
89e8a244b97e ("cpusets: avoid looping when storing to mems_allowed if one
node remains set"), but it's still possible that an empty nodemask may be
read from a mempolicy because the old nodemask may be remapped to the new
nodemask during rebind.  To prevent this, only avoid the stall if there is
no mempolicy for the thread being changed.

This is a temporary solution until all reads from mempolicy nodemasks can
be guaranteed to not be empty without the get_mems_allowed()
synchronization.

Also moves the check for nodemask intersection inside task_lock() so that
tsk->mems_allowed cannot change.  This ensures that nothing can set this
tsk's mems_allowed out from under us and also protects tsk->mempolicy.

Reported-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Paul Menage <paul@paulmenage.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoMerge remote-tracking branch 'uapi/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:39:01 +0000 (16:39 +1100)]
Merge remote-tracking branch 'uapi/for-next'

12 years agoMerge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Wed, 14 Dec 2011 05:37:29 +0000 (16:37 +1100)]
Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h
scripts/kconfig/Makefile

12 years agoMerge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:33:03 +0000 (16:33 +1100)]
Merge remote-tracking branch 'remoteproc/for-next'

12 years agoMerge remote-tracking branch 'memblock/memblock-kill-early_node_map'
Stephen Rothwell [Wed, 14 Dec 2011 05:26:09 +0000 (16:26 +1100)]
Merge remote-tracking branch 'memblock/memblock-kill-early_node_map'

Conflicts:
arch/arm/mm/init.c
arch/score/Kconfig

12 years agoMerge remote-tracking branch 'xshm/xshm-for-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:24:38 +0000 (16:24 +1100)]
Merge remote-tracking branch 'xshm/xshm-for-next'

12 years agoMerge remote-tracking branch 'kmap_atomic/kmap_atomic'
Stephen Rothwell [Wed, 14 Dec 2011 05:21:30 +0000 (16:21 +1100)]
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

Conflicts:
Documentation/feature-removal-schedule.txt

12 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:14:49 +0000 (16:14 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig

12 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:13:15 +0000 (16:13 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

12 years agoMerge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:06:50 +0000 (16:06 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'

12 years agoMerge remote-tracking branch 'tmem/tmem'
Stephen Rothwell [Wed, 14 Dec 2011 05:04:59 +0000 (16:04 +1100)]
Merge remote-tracking branch 'tmem/tmem'

Conflicts:
mm/swapfile.c

12 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:03:18 +0000 (16:03 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'

12 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 14 Dec 2011 05:01:35 +0000 (16:01 +1100)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/hid/hid-hyperv.c
drivers/staging/hv/Kconfig
drivers/staging/hv/Makefile
drivers/staging/iio/adc/ad799x_core.c

12 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 14 Dec 2011 04:54:37 +0000 (15:54 +1100)]
Merge remote-tracking branch 'usb/usb-next'

12 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 14 Dec 2011 04:52:40 +0000 (15:52 +1100)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile

12 years agoMerge commit 'refs/next/20111213/driver-core'
Stephen Rothwell [Wed, 14 Dec 2011 04:45:29 +0000 (15:45 +1100)]
Merge commit 'refs/next/20111213/driver-core'

12 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 04:31:51 +0000 (15:31 +1100)]
Merge remote-tracking branch 'hsi/for-next'

12 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 04:30:23 +0000 (15:30 +1100)]
Merge remote-tracking branch 'regmap/for-next'

Conflicts:
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c

12 years agoMerge remote-tracking branch 'namespace/master'
Stephen Rothwell [Wed, 14 Dec 2011 04:15:03 +0000 (15:15 +1100)]
Merge remote-tracking branch 'namespace/master'

12 years agoMerge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Wed, 14 Dec 2011 04:13:25 +0000 (15:13 +1100)]
Merge remote-tracking branch 'sysctl/master'

12 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 04:07:19 +0000 (15:07 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/x86/xen/Kconfig

12 years agoMerge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Wed, 14 Dec 2011 04:05:48 +0000 (15:05 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig

12 years agoMerge remote-tracking branch 'oprofile/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 04:04:03 +0000 (15:04 +1100)]
Merge remote-tracking branch 'oprofile/for-next'

12 years agoMerge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 14 Dec 2011 03:57:33 +0000 (14:57 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'

12 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:51:16 +0000 (14:51 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

12 years agoMerge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:44:18 +0000 (14:44 +1100)]
Merge remote-tracking branch 'uprobes/for-next'

12 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 14 Dec 2011 03:36:58 +0000 (14:36 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
fs/proc/stat.c
fs/proc/uptime.c
kernel/sched/core.c

12 years agoMerge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Wed, 14 Dec 2011 03:34:24 +0000 (14:34 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:32:47 +0000 (14:32 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:29:10 +0000 (14:29 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

12 years agoMerge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:27:36 +0000 (14:27 +1100)]
Merge remote-tracking branch 'apm/for-next'

12 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:20:44 +0000 (14:20 +1100)]
Merge remote-tracking branch 'pm/linux-next'

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:13:26 +0000 (14:13 +1100)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
arch/powerpc/platforms/40x/Kconfig

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:13:16 +0000 (14:13 +1100)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Wed, 14 Dec 2011 03:06:52 +0000 (14:06 +1100)]
Merge remote-tracking branch 'cputime/cputime'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 14 Dec 2011 03:05:25 +0000 (14:05 +1100)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 03:03:47 +0000 (14:03 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 14 Dec 2011 03:01:03 +0000 (14:01 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:59:35 +0000 (13:59 +1100)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:58:01 +0000 (13:58 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'

12 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:53:09 +0000 (13:53 +1100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/nouveau/nouveau_sgdma.c

12 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:48:53 +0000 (13:48 +1100)]
Merge remote-tracking branch 'mfd/for-next'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:47:24 +0000 (13:47 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:45:55 +0000 (13:45 +1100)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:45:45 +0000 (13:45 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:44:19 +0000 (13:44 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/card/block.c

12 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 14 Dec 2011 02:41:01 +0000 (13:41 +1100)]
Merge remote-tracking branch 'battery/master'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:38:34 +0000 (13:38 +1100)]
Merge remote-tracking branch 'block/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 14 Dec 2011 02:36:56 +0000 (13:36 +1100)]
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Wed, 14 Dec 2011 02:35:26 +0000 (13:35 +1100)]
Merge branch 'quilt/rr'

12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 14 Dec 2011 02:34:00 +0000 (13:34 +1100)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 02:32:20 +0000 (13:32 +1100)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 14 Dec 2011 02:30:45 +0000 (13:30 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/bcm63xxpart.c

12 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 14 Dec 2011 02:27:47 +0000 (13:27 +1100)]
Merge remote-tracking branch 'mtd/master'

12 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 14 Dec 2011 02:25:57 +0000 (13:25 +1100)]
Merge remote-tracking branch 'wireless-next/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 14 Dec 2011 02:02:10 +0000 (13:02 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 14 Dec 2011 01:22:40 +0000 (12:22 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c

12 years agoMerge remote-tracking branch 'ibft/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 01:21:14 +0000 (12:21 +1100)]
Merge remote-tracking branch 'ibft/linux-next'

12 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Wed, 14 Dec 2011 01:19:42 +0000 (12:19 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

12 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Wed, 14 Dec 2011 01:17:56 +0000 (12:17 +1100)]
Merge remote-tracking branch 'scsi/master'

12 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 14 Dec 2011 01:16:25 +0000 (12:16 +1100)]
Merge remote-tracking branch 'dlm/next'

12 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 01:14:59 +0000 (12:14 +1100)]
Merge remote-tracking branch 'ubi/linux-next'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 14 Dec 2011 01:13:01 +0000 (12:13 +1100)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 01:12:57 +0000 (12:12 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 01:11:29 +0000 (12:11 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 14 Dec 2011 01:08:04 +0000 (12:08 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/media/as102/as102_drv.h

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 14 Dec 2011 01:06:38 +0000 (12:06 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 14 Dec 2011 01:05:14 +0000 (12:05 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 14 Dec 2011 01:03:48 +0000 (12:03 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Wed, 14 Dec 2011 01:02:19 +0000 (12:02 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 01:00:54 +0000 (12:00 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:54:53 +0000 (11:54 +1100)]
Merge remote-tracking branch 'pci/linux-next'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:53:29 +0000 (11:53 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:50:37 +0000 (11:50 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 14 Dec 2011 00:49:11 +0000 (11:49 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 14 Dec 2011 00:47:36 +0000 (11:47 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:46:08 +0000 (11:46 +1100)]
Merge remote-tracking branch 'fuse/for-next'

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 14 Dec 2011 00:44:44 +0000 (11:44 +1100)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 14 Dec 2011 00:44:41 +0000 (11:44 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 14 Dec 2011 00:43:13 +0000 (11:43 +1100)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 14 Dec 2011 00:41:46 +0000 (11:41 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 14 Dec 2011 00:41:28 +0000 (11:41 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch '4xx/next'
Stephen Rothwell [Wed, 14 Dec 2011 00:39:04 +0000 (11:39 +1100)]
Merge remote-tracking branch '4xx/next'

Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c

12 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 14 Dec 2011 00:36:35 +0000 (11:36 +1100)]
Merge remote-tracking branch 'powerpc/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:35:10 +0000 (11:35 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:33:18 +0000 (11:33 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
arch/mips/kernel/perf_event_mipsxx.c

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:31:49 +0000 (11:31 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.debug

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:30:27 +0000 (11:30 +1100)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 14 Dec 2011 00:29:04 +0000 (11:29 +1100)]
Merge remote-tracking branch 'ia64/next'

12 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 14 Dec 2011 00:27:43 +0000 (11:27 +1100)]
Merge branch 'quilt/hexagon'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:26:03 +0000 (11:26 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:20:40 +0000 (11:20 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

12 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:19:17 +0000 (11:19 +1100)]
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:17:56 +0000 (11:17 +1100)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:16:28 +0000 (11:16 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h

12 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:14:01 +0000 (11:14 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-mxs/include/mach/common.h

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 14 Dec 2011 00:08:06 +0000 (11:08 +1100)]
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c

12 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Wed, 14 Dec 2011 00:06:41 +0000 (11:06 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'